14 unrec = checkout --patch |
14 unrec = checkout --patch |
15 amend = commit -p --amend |
15 amend = commit -p --amend |
16 st = status -sb |
16 st = status -sb |
17 co = checkout |
17 co = checkout |
18 br = branch |
18 br = branch |
|
19 brd = diff @{u}.. |
|
20 brf = diff --name-only @{u}.. |
19 staged = diff --cached |
21 staged = diff --cached |
20 unstage = reset HEAD -- |
22 unstage = reset HEAD -- |
21 rollback = reset --soft ^HEAD |
23 rollback = reset --soft ^HEAD |
|
24 pushF = push --force-with-lease |
22 up = pull -r --prune |
25 up = pull -r --prune |
23 update = "!git remote update -p && git merge --ff-only --stat @{u}" |
26 update = "!git remote update -p && git merge --ff-only --stat @{u}" |
24 in = "!git remote update -p; git log --pretty=onelinecustom ..@{u}" |
27 in = "!git remote update -p; git log --pretty=onelinecustom ..@{u}" |
25 out = "!git log --pretty=onelinecustom @{u}.." |
28 out = "!git log --pretty=onelinecustom @{u}.." |
26 new = "!git log --pretty=onelinecustom $1@{1}..$1@{0}" |
29 new = "!git log --pretty=onelinecustom $1@{1}..$1@{0}" |