| commit | c757aa2d12ceeb5a86c2da8ad1e9e752625af739 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 17 Aug 2018 20:09:59 +0000 (17 13:09 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 17 Aug 2018 20:09:59 +0000 (17 13:09 -0700) | ||
| tree | 9adebc7b9fe47fde483eb4d1734c83dc355ccdc7 | treesnapshot (tar.gz zip) |
| parent | f74e7b8c5b1d5d7a70cfd3a747ee7242060092e9 | commitdiff |
| parent | 46af44b07dd433c073778f0d5ab27d0167dbcec4 | commitdiff |
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
"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
| builtin/pull.c | diff1 | diff2 | blobhistory |
| t/t5520-pull.sh | diff1 | diff2 | blobhistory |