]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 9832cb9) | patch
Do not ignore merge options in interactive rebase
authorArnaud Fontaine <arnau@debian.org>
Tue, 2 Jul 2013 08:05:48 +0000 (17:05 +0900)
committerJunio C Hamano <gitster@pobox.com>
Tue, 2 Jul 2013 19:46:30 +0000 (12:46 -0700)
commitdb2b3b820e2b28da268cc88adff076b396392dfe
tree138556cd722ed76cfbef4958c73e1d835643c16dtree | snapshot
parent9832cb9d4dc969fbfacfd1f8940fcbdec18bb930commit | diff
Do not ignore merge options in interactive rebase

Merge strategy and its options can be specified in `git rebase`,
but with `--interactive`, they were completely ignored.

Signed-off-by: Arnaud Fontaine <arnau@debian.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-rebase--interactive.sh diff | blob | history
t/t3404-rebase-interactive.sh diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.