25 st = status -sb |
25 st = status -sb |
26 co = checkout |
26 co = checkout |
27 br = branch |
27 br = branch |
28 staged = diff --cached |
28 staged = diff --cached |
29 unstage = reset HEAD -- |
29 unstage = reset HEAD -- |
|
30 rollback = reset --soft ^HEAD |
30 up = pull -r --prune |
31 up = pull -r --prune |
31 update = "!git remote update -p && git merge --ff-only --stat @{u}" |
32 update = "!git remote update -p && git merge --ff-only --stat @{u}" |
32 in = "!git remote update -p; git log --pretty=onelinecustom ..@{u}" |
33 in = "!git remote update -p; git log --pretty=onelinecustom ..@{u}" |
33 out = "!git log --pretty=onelinecustom @{u}.." |
34 out = "!git log --pretty=onelinecustom @{u}.." |
34 new = "!git log --pretty=onelinecustom $1@{1}..$1@{0}" |
35 new = "!git log --pretty=onelinecustom $1@{1}..$1@{0}" |