diff options
| author | Arnaud Fontaine <arnau@debian.org> | 2013-07-02 17:05:48 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-02 12:46:30 -0700 |
| commit | db2b3b820e2b28da268cc88adff076b396392dfe (patch) | |
| tree | 138556cd722ed76cfbef4958c73e1d835643c16d /t | |
| parent | 9832cb9d4dc969fbfacfd1f8940fcbdec18bb930 (diff) | |
| download | git-db2b3b820e2b28da268cc88adff076b396392dfe.tar.gz | |
Do not ignore merge options in interactive rebaseaf/rebase-i-merge-options
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>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3404-rebase-interactive.sh | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index d6b4143773..8a6ec039fe 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -950,4 +950,15 @@ test_expect_success 'rebase -i, with <onto> and <upstream> specified as :/quuxer git checkout branch1 ' +test_expect_success 'rebase -i with --strategy and -X' ' + git checkout -b conflict-merge-use-theirs conflict-branch && + git reset --hard HEAD^ && + echo five >conflict && + echo Z >file1 && + git commit -a -m "one file conflict" && + EDITOR=true git rebase -i --strategy=recursive -Xours conflict-branch && + test $(git show conflict-branch:conflict) = $(cat conflict) && + test $(cat file1) = Z +' + test_done |