diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2016-01-13 12:17:15 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-01-13 20:59:15 (GMT) |
| commit | f5eb87b98dd6aa587683057b9f5bd063e682e145 (patch) | |
| tree | 6a8efdcf373a731fa660412f0669b5fab564037a /Documentation/git-pull.txt | |
| parent | 754884255bb580df159e58defa81cdd30b5c430c (diff) | |
| download | git-f5eb87b98dd6aa587683057b9f5bd063e682e145.zip git-f5eb87b98dd6aa587683057b9f5bd063e682e145.tar.gz git-f5eb87b98dd6aa587683057b9f5bd063e682e145.tar.bz2 | |
pull: allow interactive rebase with --rebase=interactive
A couple of years ago, I found the need to collaborate on topic
branches that were rebased all the time, and I really needed to see
what I was rebasing when pulling, so I introduced an
interactively-rebasing pull.
The way builtin pull works, this change also supports the value
'interactive' for the 'branch.<name>.rebase' config variable, which
is a neat thing because users can now configure given branches for
interactively-rebasing pulls without having to type out the complete
`--rebase=interactive` option every time they pull.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-pull.txt')
| -rw-r--r-- | Documentation/git-pull.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index 93c72a2..a62a2a6 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -101,7 +101,7 @@ Options related to merging include::merge-options.txt[] -r:: ---rebase[=false|true|preserve]:: +--rebase[=false|true|preserve|interactive]:: When true, rebase the current branch on top of the upstream branch after fetching. If there is a remote-tracking branch corresponding to the upstream branch and the upstream branch @@ -113,6 +113,8 @@ to `git rebase` so that locally created merge commits will not be flattened. + When false, merge the current branch into the upstream branch. + +When `interactive`, enable the interactive mode of rebase. ++ See `pull.rebase`, `branch.<name>.rebase` and `branch.autoSetupRebase` in linkgit:git-config[1] if you want to make `git pull` always use `--rebase` instead of merging. |