| commit | db2b3b820e2b28da268cc88adff076b396392dfe | |
| author | Arnaud Fontaine <arnau@debian.org> | |
| Tue, 2 Jul 2013 08:05:48 +0000 (2 17:05 +0900) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 2 Jul 2013 19:46:30 +0000 (2 12:46 -0700) | ||
| tree | 138556cd722ed76cfbef4958c73e1d835643c16d | treesnapshot (tar.gz zip) |
| parent | 9832cb9d4dc969fbfacfd1f8940fcbdec18bb930 | commitdiff |
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>
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 | diffblobblamehistory | |
| t/t3404-rebase-interactive.sh | diffblobblamehistory |