diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2018-04-25 12:29:38 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-04-26 03:28:43 (GMT) |
| commit | 1131ec98189e993dcc48043c4f8e8b0128f52055 (patch) | |
| tree | d22836ec39f637e12847dd05172c82865d510808 /Documentation/git-pull.txt | |
| parent | 7ccdf65b63f2f4a5e751d70b9788af3c9e16b6ab (diff) | |
| download | git-1131ec98189e993dcc48043c4f8e8b0128f52055.zip git-1131ec98189e993dcc48043c4f8e8b0128f52055.tar.gz git-1131ec98189e993dcc48043c4f8e8b0128f52055.tar.bz2 | |
pull: accept --rebase=merges to recreate the branch topology
Similar to the `preserve` mode simply passing the `--preserve-merges`
option to the `rebase` command, the `merges` mode simply passes the
`--rebase-merges` option.
This will allow users to conveniently rebase non-trivial commit
topologies when pulling new commits, without flattening them.
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 | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index ce05b7a..4e0ad6f 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -101,13 +101,17 @@ Options related to merging include::merge-options.txt[] -r:: ---rebase[=false|true|preserve|interactive]:: +--rebase[=false|true|merges|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 was rebased since last fetched, the rebase uses that information to avoid rebasing non-local changes. + +When set to `merges`, rebase using `git rebase --rebase-merges` so that +the local merge commits are included in the rebase (see +linkgit:git-rebase[1] for details). ++ When set to preserve, rebase with the `--preserve-merges` option passed to `git rebase` so that locally created merge commits will not be flattened. + |