diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-05-28 14:42:15 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-05-28 22:22:34 +0200 |
| commit | 7401ab92f8c9c9f7c81763d6f7da8a63a258eff2 (patch) | |
| tree | 828349409199b3d78c5c7a0dd0bf2d630d5dbe4a /Documentation/git-pull.txt | |
| parent | tests: mark a couple more test cases as requiring `rebase -p` (diff) | |
| download | git-7401ab92f8c9c9f7c81763d6f7da8a63a258eff2.tar.xz git-7401ab92f8c9c9f7c81763d6f7da8a63a258eff2.zip | |
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>
Diffstat (limited to '')
| -rw-r--r-- | Documentation/git-pull.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index 118d9d86f7..a5e9501a0a 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -112,8 +112,9 @@ 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. +When set to `preserve` (deprecated in favor of `merges`), rebase with the +`--preserve-merges` option passed to `git rebase` so that locally created +merge commits will not be flattened. + When false, merge the current branch into the upstream branch. + |