diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-01-26 15:40:28 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-01-26 15:40:28 -0800 |
| commit | f9219c0b3233229c6686224dfc953e5b3fe92a84 (patch) | |
| tree | dda36de7637de07f35bcdbec4a5ccb41b0821aaa /Documentation/config.txt | |
| parent | e572fef9d459497de2bd719747d5625a27c9b41d (diff) | |
| parent | 17c4ddbbaf5842ee6389f6a0f525c40d15152b55 (diff) | |
| download | git-f9219c0b3233229c6686224dfc953e5b3fe92a84.tar.gz | |
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 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 07f7a3b771..0f710ca3c2 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -870,6 +870,8 @@ When preserve, also pass `--preserve-merges` along to 'git rebase' so that locally committed merge commits will not be flattened by running 'git pull'. + +When the value is `interactive`, the rebase is run in interactive mode. ++ *NOTE*: this is a possibly dangerous operation; do *not* use it unless you understand the implications (see linkgit:git-rebase[1] for details). @@ -2157,6 +2159,8 @@ When preserve, also pass `--preserve-merges` along to 'git rebase' so that locally committed merge commits will not be flattened by running 'git pull'. + +When the value is `interactive`, the rebase is run in interactive mode. ++ *NOTE*: this is a possibly dangerous operation; do *not* use it unless you understand the implications (see linkgit:git-rebase[1] for details). |