diff options
| author |  Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-05-28 05:42:15 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-05-28 13:22:34 -0700 |
| commit | 7401ab92f8c9c9f7c81763d6f7da8a63a258eff2 (patch) | |
| tree | 828349409199b3d78c5c7a0dd0bf2d630d5dbe4a /contrib/emacs | |
| parent | tests: mark a couple more test cases as requiring `rebase -p` (diff) | |
| download | tgif-7401ab92f8c9c9f7c81763d6f7da8a63a258eff2.tar.xz | |
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 'contrib/emacs')
0 files changed, 0 insertions, 0 deletions