Merge strategy and its options can be specified in `git rebase`,
but with `--interactive`, they were completely ignored.
Signed-off-by: Arnaud Fontaine ar...@debian.org
---
git-rebase--interactive.sh| 11 ++-
t/t3404-rebase-interactive.sh | 11 +++
2 files changed, 21
Junio C Hamano gits...@pobox.com writes:
Arnaud Fontaine ar...@debian.org writes:
Merge strategy and its options can be specified in `git rebase`, but
with `--interactive`, they were completely ignored.
And why is it a bad thing? If you meant s/--interactive/-m/ in the
above, then I
Fix inconsistency where `--strategy` and/or `--strategy-option` can be
specified in git rebase, but with `--interactive` argument only there
were completely ignored.
Signed-off-by: Arnaud Fontaine ar...@debian.org
---
git-rebase--interactive.sh| 13 ++---
t/t3404-rebase
have just
squashed your patch into mine and ran successfully t3404 and t3421 tests
after rebasing my branch on top of current master.
I will send the final patch in another email. Of course, feel free to
take authorship of the patch or add yourself as Signed-off-by.
Cheers,
--
Arnaud Fontaine
Merge strategy and its options can be specified in `git rebase`,
but with `--interactive`, they were completely ignored.
Signed-off-by: Arnaud Fontaine ar...@debian.org
---
git-rebase--interactive.sh| 21 -
t/t3404-rebase-interactive.sh | 11 +++
2 files changed
5 matches
Mail list logo
