19 brd = diff @{u}.. |
19 brd = diff @{u}.. |
20 brf = diff --name-only @{u}.. |
20 brf = diff --name-only @{u}.. |
21 staged = diff --cached |
21 staged = diff --cached |
22 unstage = reset HEAD -- |
22 unstage = reset HEAD -- |
23 rollback = reset --soft ^HEAD |
23 rollback = reset --soft ^HEAD |
|
24 histedit = rebase -i --autosquash --onto @{u}... @{u} |
24 pushf = push --force-with-lease |
25 pushf = push --force-with-lease |
25 up = pull -r --prune |
26 up = pull -r --prune |
26 update = "!git remote update -p && git merge --ff-only --stat @{u}" |
27 update = "!git remote update -p && git merge --ff-only --stat @{u}" |
27 in = "!git remote update -p; git log --pretty=onelinecustom ..@{u}" |
28 in = "!git remote update -p; git log --pretty=onelinecustom ..@{u}" |
28 out = "!git log --pretty=onelinecustom @{u}.." |
29 out = "!git log --pretty=onelinecustom @{u}.." |