diff options
| author | Mike Crute <crutem@amazon.com> | 2015-10-05 11:52:57 -0700 |
|---|---|---|
| committer | Mike Crute <mike@crute.us> | 2015-10-05 11:52:57 -0700 |
| commit | ce0432d56e00a01245a812b4ac55d83950dbe131 (patch) | |
| tree | 7ac56647d5910c8c71dba03b018730f4f79661e5 /.gitconfig | |
| parent | 6a1f76f35f3623105ea91f10c7a7edf5dfb1af67 (diff) | |
| download | dotfiles-ce0432d56e00a01245a812b4ac55d83950dbe131.tar.bz2 dotfiles-ce0432d56e00a01245a812b4ac55d83950dbe131.tar.xz dotfiles-ce0432d56e00a01245a812b4ac55d83950dbe131.zip | |
Merge more things from work
Diffstat (limited to '.gitconfig')
| -rw-r--r-- | .gitconfig | 5 |
1 files changed, 3 insertions, 2 deletions
| @@ -32,13 +32,15 @@ | |||
| 32 | sm = submodule | 32 | sm = submodule |
| 33 | 33 | ||
| 34 | fm = merge --ff-only origin/master | 34 | fm = merge --ff-only origin/master |
| 35 | in = !git l ..origin/master | ||
| 36 | out = !git l origin/master.. | ||
| 37 | |||
| 35 | pr = pull --rebase | 38 | pr = pull --rebase |
| 36 | ar = add -A | 39 | ar = add -A |
| 37 | rc = rebase --continue | 40 | rc = rebase --continue |
| 38 | ri = rebase -i | 41 | ri = rebase -i |
| 39 | dc = diff --cached | 42 | dc = diff --cached |
| 40 | rk = rm --cached | 43 | rk = rm --cached |
| 41 | in = !git l ..origin/master | ||
| 42 | ra = !git l --all -20 | 44 | ra = !git l --all -20 |
| 43 | lp = log --format=full -p -1 | 45 | lp = log --format=full -p -1 |
| 44 | lf = log --format=fuller -p | 46 | lf = log --format=fuller -p |
| @@ -52,7 +54,6 @@ | |||
| 52 | uig = update-index --no-assume-unchanged | 54 | uig = update-index --no-assume-unchanged |
| 53 | arp = add -A -p | 55 | arp = add -A -p |
| 54 | put = push origin head | 56 | put = push origin head |
| 55 | out = !git l origin/master.. | ||
| 56 | 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 | 57 | 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 |
| 57 | 58 | ||
| 58 | made = log --reverse --format='format:%C(blue)%an%C(reset) <%ae> %C(green)(%ar)%C(reset)' | 59 | made = log --reverse --format='format:%C(blue)%an%C(reset) <%ae> %C(green)(%ar)%C(reset)' |