diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-03-11 19:57:35 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-03-12 07:29:00 (GMT) |
| commit | 427c3bd28ab504443d0eea6fc6aa27b0c0748372 (patch) | |
| tree | 18f3e30923873d34a5ea60692ae3478f8564c83e /Documentation/config/pull.txt | |
| parent | 6053c04b88d28b31d752dc8783ff59324b6a82f7 (diff) | |
| download | git-427c3bd28ab504443d0eea6fc6aa27b0c0748372.zip git-427c3bd28ab504443d0eea6fc6aa27b0c0748372.tar.gz git-427c3bd28ab504443d0eea6fc6aa27b0c0748372.tar.bz2 | |
rebase: deprecate --preserve-merges
We have something much better now: --rebase-merges (which is a
complete re-design --preserve-merges, with a lot of issues fixed such as
the inability to reorder commits with --preserve-merges).
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config/pull.txt')
| -rw-r--r-- | Documentation/config/pull.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/config/pull.txt b/Documentation/config/pull.txt index bb23a99..b87cab3 100644 --- a/Documentation/config/pull.txt +++ b/Documentation/config/pull.txt @@ -18,9 +18,9 @@ When `merges`, pass the `--rebase-merges` option to 'git rebase' so that the local merge commits are included in the rebase (see linkgit:git-rebase[1] for details). + -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 `preserve` (deprecated in favor of `merges`), 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. + |