diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-01-26 23:40:28 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-01-26 23:40:28 (GMT) |
| commit | f9219c0b3233229c6686224dfc953e5b3fe92a84 (patch) | |
| tree | dda36de7637de07f35bcdbec4a5ccb41b0821aaa /contrib | |
| parent | e572fef9d459497de2bd719747d5625a27c9b41d (diff) | |
| parent | 17c4ddbbaf5842ee6389f6a0f525c40d15152b55 (diff) | |
| download | git-f9219c0b3233229c6686224dfc953e5b3fe92a84.zip git-f9219c0b3233229c6686224dfc953e5b3fe92a84.tar.gz git-f9219c0b3233229c6686224dfc953e5b3fe92a84.tar.bz2 | |
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
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/completion/git-completion.bash | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index ab4da7f..51f5223 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1809,7 +1809,7 @@ _git_config () return ;; branch.*.rebase) - __gitcomp "false true" + __gitcomp "false true preserve interactive" return ;; remote.pushdefault) |