10 |
10 |
11 [alias] |
11 [alias] |
12 ci = commit |
12 ci = commit |
13 rec = !sh -c '(git add -p -- $@ && git commit -v ) || git reset' -- |
13 rec = !sh -c '(git add -p -- $@ && git commit -v ) || git reset' -- |
14 unrec = checkout --patch |
14 unrec = checkout --patch |
|
15 sb = status -sb |
15 update = "!git remote update -p && git merge --ff-only --stat @{u}" |
16 update = "!git remote update -p && git merge --ff-only --stat @{u}" |
16 in = "!git remote update -p; git log ..@{u}" |
17 in = "!git remote update -p; git log ..@{u}" |
17 out = log @{u}.. |
18 out = log @{u}.. |
18 cleanup = "!git branch --merged | grep -v '\\*\\|master\\|develop' | xargs -n 1 echo git branch -d" |
19 cleanup = "!git branch --merged | grep -v '\\*\\|master\\|develop' | xargs -n 1 echo git branch -d" |
19 ctags = "!~/.git_helpers/ctags" |
20 ctags = "!~/.git_helpers/ctags" |