diff options
| author | Mike Crute <mcrute@gmail.com> | 2014-07-23 10:00:27 -0700 |
|---|---|---|
| committer | Mike Crute <mike@crute.us> | 2014-07-23 10:00:27 -0700 |
| commit | e0d33dac99b15de9b483df448a7946138e88dbc6 (patch) | |
| tree | 6c38525f792e72e4c38c8030696ee5f167949a9e /.gitconfig | |
| parent | 791894206ac15eb5ef3eee6fd9dae9528b721981 (diff) | |
| download | dotfiles-e0d33dac99b15de9b483df448a7946138e88dbc6.tar.bz2 dotfiles-e0d33dac99b15de9b483df448a7946138e88dbc6.tar.xz dotfiles-e0d33dac99b15de9b483df448a7946138e88dbc6.zip | |
Fix aliases
Diffstat (limited to '.gitconfig')
| -rw-r--r-- | .gitconfig | 8 |
1 files changed, 4 insertions, 4 deletions
| @@ -25,14 +25,14 @@ | |||
| 25 | co = checkout | 25 | co = checkout |
| 26 | sm = submodule | 26 | sm = submodule |
| 27 | 27 | ||
| 28 | fm = merge --ff-only origin/mainline | 28 | fm = merge --ff-only origin/master |
| 29 | pr = pull --rebase | 29 | pr = pull --rebase |
| 30 | ar = add -A | 30 | ar = add -A |
| 31 | rc = rebase --continue | 31 | rc = rebase --continue |
| 32 | ri = rebase -i | 32 | ri = rebase -i |
| 33 | dc = diff --cached | 33 | dc = diff --cached |
| 34 | rc = rm --cached | 34 | rk = rm --cached |
| 35 | in = !git l ..origin/mainline | 35 | in = !git l ..origin/master |
| 36 | ra = !git l --all -20 | 36 | ra = !git l --all -20 |
| 37 | lp = log --format=full -p -1 | 37 | lp = log --format=full -p -1 |
| 38 | lf = log --format=fuller -p | 38 | lf = log --format=fuller -p |
| @@ -45,7 +45,7 @@ | |||
| 45 | uig = update-index --no-assume-unchanged | 45 | uig = update-index --no-assume-unchanged |
| 46 | arp = add -A -p | 46 | arp = add -A -p |
| 47 | put = push origin head | 47 | put = push origin head |
| 48 | out = !git l origin/mainline.. | 48 | out = !git l origin/master.. |
| 49 | dag = log --graph --format='format:%C(yellow)%h%C(reset) %C(blue)\"%an\" <%ae>%C(reset) %C(magenta)%cr%C(reset)%C(auto)%d%C(reset)%n%s' --date-order | 49 | dag = log --graph --format='format:%C(yellow)%h%C(reset) %C(blue)\"%an\" <%ae>%C(reset) %C(magenta)%cr%C(reset)%C(auto)%d%C(reset)%n%s' --date-order |
| 50 | 50 | ||
| 51 | [color] | 51 | [color] |