Junio C Hamano writes:
> Arnaud Fontaine 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, th
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
---
git-rebase--interactive.sh| 13 ++---
t/t3404-rebase-interactive.sh | 11
;;
> *)
> - output git cherry-pick $strategy_args "$@" ||
> + output eval git cherry-pick "$strategy_args" "$@" ||
> die_with_patch $sha1 "Could not pick $sha1"
> ;;
> esac
Indeed, this is much better this way. Thank you very much! I 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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Merge strategy and its options can be specified in `git rebase`,
but with `--interactive`, they were completely ignored.
Signed-off-by: Arnaud Fontaine
---
git-rebase--interactive.sh| 21 -
t/t3404-rebase-interactive.sh | 11 +++
2 files changed, 27 insertions
Merge strategy and its options can be specified in `git rebase`,
but with `--interactive`, they were completely ignored.
Signed-off-by: Arnaud Fontaine
---
git-rebase--interactive.sh| 11 ++-
t/t3404-rebase-interactive.sh | 11 +++
2 files changed, 21 insertions(+), 1
5 matches
Mail list logo
