| commit | f9219c0b3233229c6686224dfc953e5b3fe92a84 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 26 Jan 2016 23:40:28 +0000 (26 15:40 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 26 Jan 2016 23:40:28 +0000 (26 15:40 -0800) | ||
| tree | dda36de7637de07f35bcdbec4a5ccb41b0821aaa | treesnapshot (tar.gz zip) |
| parent | e572fef9d459497de2bd719747d5625a27c9b41d | commitdiff |
| parent | 17c4ddbbaf5842ee6389f6a0f525c40d15152b55 | commitdiff |
Merge branch 'js/pull-rebase-i'
"git pull --rebase" has been extended to allow invoking
"rebase -i".
* js/pull-rebase-i:
completion: add missing branch.*.rebase values
remote: handle the config setting branch.*.rebase=interactive
pull: allow interactive rebase with --rebase=interactive
"git pull --rebase" has been extended to allow invoking
"rebase -i".
* js/pull-rebase-i:
completion: add missing branch.*.rebase values
remote: handle the config setting branch.*.rebase=interactive
pull: allow interactive rebase with --rebase=interactive
| Documentation/config.txt | diff1 | diff2 | blobhistory |
| builtin/pull.c | diff1 | diff2 | blobhistory |
| contrib/completion/git-completion.bash | diff1 | diff2 | blobhistory |