diff options
| author | Mike Crute <crutem@amazon.com> | 2018-10-11 13:47:30 -0700 |
|---|---|---|
| committer | Mike Crute <crutem@amazon.com> | 2018-10-11 13:47:30 -0700 |
| commit | a1a95fad3c1b74e91f1edd5c7821987d14250e1c (patch) | |
| tree | 7543790f179ea98540fc6219f339136dad20d563 /.gitconfig | |
| parent | a7164760549ad2e2cd88dc405b1646b342b4c1ba (diff) | |
| download | dotfiles-a1a95fad3c1b74e91f1edd5c7821987d14250e1c.tar.bz2 dotfiles-a1a95fad3c1b74e91f1edd5c7821987d14250e1c.tar.xz dotfiles-a1a95fad3c1b74e91f1edd5c7821987d14250e1c.zip | |
Use upstream ref for out/in
Diffstat (limited to '.gitconfig')
| -rw-r--r-- | .gitconfig | 4 |
1 files changed, 2 insertions, 2 deletions
| @@ -32,8 +32,8 @@ | |||
| 32 | sm = submodule | 32 | sm = submodule |
| 33 | 33 | ||
| 34 | fm = merge --ff-only | 34 | fm = merge --ff-only |
| 35 | in = !"git l ..origin/$(git rev-parse --abbrev-ref HEAD)" | 35 | in = !"git l ..$(git rev-parse --abbrev-ref --symbolic-full-name @{upstream})" |
| 36 | out = !"git l origin/$(git rev-parse --abbrev-ref HEAD).." | 36 | out = !"git l $(git rev-parse --abbrev-ref --symbolic-full-name @{upstream}).." |
| 37 | 37 | ||
| 38 | pr = pull --rebase | 38 | pr = pull --rebase |
| 39 | ar = add -A | 39 | ar = add -A |