13 record = !sh -c '(git add -p -- $@ && git commit -v ) || git reset' -- |
13 record = !sh -c '(git add -p -- $@ && git commit -v ) || git reset' -- |
14 update = !git fetch --all --tags --prune && git pull --rebase |
14 update = !git fetch --all --tags --prune && git pull --rebase |
15 incoming = "!git remote update -p; git log ..@{u}" |
15 incoming = "!git remote update -p; git log ..@{u}" |
16 outgoing = log @{u}.. |
16 outgoing = log @{u}.. |
17 glog = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative |
17 glog = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative |
|
18 cleanup = "!git branch --merged | grep -v '\\*\\|master\\|develop' | xargs -n 1 echo git branch -d" |
18 |
19 |
19 [branch] |
20 [branch] |
20 autosetuprebase = always |
21 autosetuprebase = always |
|
22 autosetupmerge = always |
|
23 |
|
24 [push] |
|
25 default = simple |
|
26 |
|
27 [rebase] |
|
28 stat = true |
21 |
29 |
22 [include] |
30 [include] |
23 path = ~/.gitconfig.local |
31 path = ~/.gitconfig.local |
24 |
32 |