-
Notifications
You must be signed in to change notification settings - Fork 2
/
gitconfig
75 lines (75 loc) · 2.16 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
[core]
editor = mvim -f
autocrlf = input
[user]
name = Wojtek Ryrych
email = [email protected]
[color]
ui = auto
[push]
default = simple
[pull]
rebase = true
[rerere]
enabled = true
[github]
user = wryrych
[alias]
cp = cherry-pick
st = status
s = status -s
cl = clone
ci = commit
cia = commit --amend
co = checkout
com = checkout master
cb = checkout -
br = branch
dc = diff --cached
df = diff
wdc = diff --cached --color-words
wdf = diff --color-words
sh = show --color-words
sortdiff = !sh -c 'git diff "$@" | grep "^[+-]" | sort --key=1.2 | uniq -u -s1
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
who = shortlog -s --
aliases = !git config --get-regexp 'alias.*' | colrm 1 6 | sed 's/[ ]/ = /'
undo=reset --hard
tree = log --oneline --decorate --graph
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
lm = log --oneline --decorate --merges
lmm = log --oneline --decorate --merges origin/master --not master
filelog = log -u
fl = log -u
dlc = diff --cached HEAD^
assume = update-index --assume-unchanged
unassume = update-index --no-assume-unchanged
assumed = "!git ls-files -v | grep ^h | cut -c 3-"
lasttag = describe --tags --abbrev=0
lt = describe --tags --abbrev=0
r = reset
r1 = reset HEAD^
r2 = reset HEAD^^
rh = reset --hard
rh1 = reset HEAD^ --hard
rh2 = reset HEAD^^ --hard
unstage = reset HEAD --
sl = stash list
sa = stash apply
ss = stash save
pushall = push --recurse-submodules=on-demand
rb = rebase
rbi = rebase -i
rbc = rebase --continue
rba = rebase --abort
rbm = rebase master
fe = fetch
pu = pull
[merge]
tool = opendiff
conflictstyle = diff3