]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 6053c04) | patch
rebase: deprecate --preserve-merges
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Mon, 11 Mar 2019 19:57:35 +0000 (12:57 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 12 Mar 2019 07:29:00 +0000 (16:29 +0900)
commit427c3bd28ab504443d0eea6fc6aa27b0c0748372
tree18f3e30923873d34a5ea60692ae3478f8564c83etree | snapshot
parent6053c04b88d28b31d752dc8783ff59324b6a82f7commit | diff
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>
Documentation/config/branch.txt diff | blob | history
Documentation/config/pull.txt diff | blob | history
Documentation/git-rebase.txt diff | blob | history
builtin/rebase.c diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.