docs: say that `--rebase=preserve` is deprecated
As of Git v2.22.0, the `--preserve-merges` backend of `git rebase` will be officially deprecated in favor of the `--rebase-merges` backend. Consequently, `git pull --rebase=preserve` will also be deprected. State this explicitly. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
May 28, 2019 at 05:42 UTC
7401ab92f8c9c9f7c81763d6f7da8a63a258eff2
1 file changed
+3
-2
Documentation/git-pull.txt
+3
-2
@@ -112,8 +112,9 @@ When set to `merges`, rebase using `git rebase --rebase-merges` so that
112
the local merge commits are included in the rebase (see
113
linkgit:git-rebase[1] for details).
114
+
115
-When set to preserve, rebase with the `--preserve-merges` option passed
116
-to `git rebase` so that locally created merge commits will not be flattened.
115
+When set to `preserve` (deprecated in favor of `merges`), rebase with the
116
+`--preserve-merges` option passed to `git rebase` so that locally created
117
+merge commits will not be flattened.
118
+
119
When false, merge the current branch into the upstream branch.
120
+