diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-11-22 22:59:29 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-11-23 09:49:23 +0900 |
| commit | ea8b7be1476a2301e3658a8e626b69c9d7f540bd (patch) | |
| tree | b267a8d64b0b04625931d6e334310b9227829ba4 /git-gui/lib/commit.tcl | |
| parent | The first batch post 2.24 cycle (diff) | |
| download | git-ea8b7be1476a2301e3658a8e626b69c9d7f540bd.tar.gz git-ea8b7be1476a2301e3658a8e626b69c9d7f540bd.zip | |
git svn: stop using `rebase --preserve-merges`
We deprecated `--preserve-merges` in favor of `--rebase-merges`; Let's
reflect that in `git svn`.
Note: Even when the user asks for `--preserve-merges`, we now silently
pass `--rebase-merges` to `git rebase` instead. Technically, this is a
change of behavior. But practically, `git svn` only ever asks for a
non-interactive rebase, and `--preserve-merges` and `--rebase-merges`
are on par with regard to that.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Acked-by: Eric Wong <e@80x24.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-gui/lib/commit.tcl')
0 files changed, 0 insertions, 0 deletions