]> git.ipfire.org Git - thirdparty/git.git/commit - builtin/rebase.c
builtin rebase: support --rebase-merges[=[no-]rebase-cousins]
authorPratik Karki <predatoramigo@gmail.com>
Tue, 4 Sep 2018 22:00:07 +0000 (15:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 11 Oct 2018 05:12:45 +0000 (14:12 +0900)
commit3c3588c7d33456e76d0ed7b881378ee575f4dc45
tree7af0ead3b20d1e65674cb8540ab2a3a405d31934
parent9b3a448b4eee25050dc1e1c14c886e27e2985819
builtin rebase: support --rebase-merges[=[no-]rebase-cousins]

The mode to rebase non-linear branches is now supported by the builtin
rebase, too.

Signed-off-by: Pratik Karki <predatoramigo@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/rebase.c