diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-08-17 13:09:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-17 13:09:59 -0700 |
| commit | c757aa2d12ceeb5a86c2da8ad1e9e752625af739 (patch) | |
| tree | 9adebc7b9fe47fde483eb4d1734c83dc355ccdc7 /resolve-undo.c | |
| parent | Merge branch 'jk/diff-rendered-docs' (diff) | |
| parent | pull --rebase=<type>: allow single-letter abbreviations for the type (diff) | |
| download | tgif-c757aa2d12ceeb5a86c2da8ad1e9e752625af739.tar.xz | |
Merge branch 'js/pull-rebase-type-shorthand'
"git pull --rebase=interactive" learned "i" as a short-hand for
"interactive".
* js/pull-rebase-type-shorthand:
pull --rebase=<type>: allow single-letter abbreviations for the type
Diffstat (limited to 'resolve-undo.c')
0 files changed, 0 insertions, 0 deletions