-
Notifications
You must be signed in to change notification settings - Fork 3
/
Copy path.gitconfig
117 lines (116 loc) · 4.56 KB
/
.gitconfig
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
[core]
excludesfile = /Users/jwaldrip/.gitignore_global
ignorecase = false
editor = vim
[user]
email = [email protected]
name = jwaldrip
signingkey = 22A5D30F
[push]
default = current
[git-up "fetch"]
all = true
[alias]
ls = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate
ll = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat
lnc = log --pretty=format:"%h\\ %s\\ [%cn]"
lds = log --pretty=format:"%C(yellow)%h\\ %ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=short
ld = log --pretty=format:"%C(yellow)%h\\ %ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=relative
le = log --oneline --decorate
filelog = log -u
fl = log -u
dl = "!git ll -1"
dlc = diff --cached HEAD^
dr = "!f() { git diff "$1"^.."$1"; }; f"
lc = "!f() { git ll "$1"^.."$1"; }; f"
diffr = "!f() { git diff "$1"^.."$1"; }; f"
f = "!git ls-files | grep -i"
grep = grep -Ii
gr = grep -Ii
tr = "!git branch --set-upstream-to=origin/`git rev-parse --abbrev-ref HEAD` `git rev-parse --abbrev-ref HEAD`"
trr = "!f() { git branch --set-upstream-to=\"$1\" `git rev-parse --abbrev-ref HEAD` ; } ; f"
gra = "!f() { A=$(pwd) && TOPLEVEL=$(git rev-parse --show-toplevel) && cd $TOPLEVEL && git grep --full-name -In $1 | xargs -I{} echo $TOPLEVEL/{} && cd $A; }; f"
la = "!git config -l | grep alias | cut -c 7-"
done = "!f() { git branch | grep "$1" | cut -c 3- | grep -v done | xargs -I{} git branch -m {} done-{}; }; f"
assume = update-index --assume-unchanged
unassume = update-index --no-assume-unchanged
assumed = "!git ls-files -v | grep ^h | cut -c 3-"
unassumeall = "!git assumed | xargs git update-index --no-assume-unchanged"
assumeall = "!git st -s | awk {'print $2'} | xargs git assume"
lasttag = describe --tags --abbrev=0
youngest = for-each-ref --sort=-committerdate refs/heads/ --format='%(committerdate:short) | %(refname:short) [%(authorname)]'
oldest = for-each-ref --sort=committerdate refs/heads/ --format='%(committerdate:short) | %(refname:short) [%(authorname)]'
recent = for-each-ref --sort=-committerdate --count=15 --format='%(refname:short)' refs/heads/
lt = describe --tags --abbrev=0
cp = cherry-pick
st = status -s
msg = commit --allow-empty -m
cl = clone
ci = commit
cma = commit -am
co = checkout
date-sha = "!f() { git rev-list -1 --before=\"$1\" \"${2-`git branch --show-current`}\"; } ; f"
cod = "!f() { date=$1; br=${2-`git branch --show-current`}; shift; shift ; git checkout `git date-sha \"$date\" \"$br\"` $@; } ; f"
br = branch
diff = diff --word-diff
dc = diff --cached
r = reset
r1 = reset HEAD^
r2 = reset HEAD^^
rh = reset --hard
rh1 = reset HEAD^ --hard
rh2 = reset HEAD^^ --hard
sl = stash list
sa = stash apply
ss = stash save
rmg = revert -m 1
shorty = status --short --branch
merc = merge --no-ff
please = push --force-with-lease
amend = commit --amend
commend = commit --amend --no-edit
it = "!git init && git commit -m 'new repo' --allow-empty"
stsh = stash --keep-index
staash = stash --include-untracke
staaash = stash --all
lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
resolve = "!f() { git branch --merged `git rev-parse --abbrev-ref HEAD` | grep -v '\\* develop' | xargs -n 1 git branch -d; } ; f"
fu = "!f() { branch=`git rev-parse --abbrev-ref HEAD`; git branch --set-upstream-to=origin/$branch $branch; } ; f"
dadd = !curl https://icanhazdadjoke.com/ && git add
commmit-lie = "!f() { git commit -m \"`curl -fsSL http://whatthecommit.com/index.txt`\" $@; } ; f"
wta = "!f() { git worktree add \"`git rev-parse --show-toplevel`-$1\" ${2-$1}; } ; f"
wtb = "!f() { git worktree add \"`git rev-parse --show-toplevel`-$1\" -b ${2-$1}; } ; f"
wtr = "!f() { git worktree remove \"`git rev-parse --show-toplevel`-$1\"; } ; f"
wtp = worktree prune
wtl = worktree list
root = rev-parse --show-toplevel
fresh = clean -fdX
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[diff]
tool = Kaleidoscope
[difftool]
prompt = false
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustExitCode = true
[mergetool]
prompt = false
keepBackup = true
[merge]
tool = Kaleidoscope
renameLimit = 999999
[http]
[credential]
helper = osxkeychain
[commit]
gpgsign = true
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
[gpg]
program = /usr/local/bin/gpg
[pull]
rebase = false