git.99rst.org Git - git.git/commit

author	Arnaud Fontaine <redacted>
	Tue, 2 Jul 2013 08:05:48 +0000 (17:05 +0900)
committer	Junio C Hamano <redacted>
	Tue, 2 Jul 2013 19:46:30 +0000 (12:46 -0700)
commit	db2b3b820e2b28da268cc88adff076b396392dfe
tree	138556cd722ed76cfbef4958c73e1d835643c16d	tree \| snapshot
parent	9832cb9d4dc969fbfacfd1f8940fcbdec18bb930	commit \| 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 <redacted>
Signed-off-by: Junio C Hamano <redacted>

git-rebase--interactive.sh		diff \| blob \| history
t/t3404-rebase-interactive.sh		diff \| blob \| history

RSS Atom

git clone https://git.99rst.org/PROJECT