diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-04-29 12:59:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-29 12:59:08 -0700 |
| commit | 175008d45474ff78ca9e3dcf038df359a97b4d92 (patch) | |
| tree | 7dc4add353d353d40a49a1c440d186e4c134cd07 /t/t3033-merge-toplevel.sh | |
| parent | Merge branch 'jk/push-client-deadlock-fix' (diff) | |
| parent | pull: pass --allow-unrelated-histories to "git merge" (diff) | |
| download | tgif-175008d45474ff78ca9e3dcf038df359a97b4d92.tar.xz | |
Merge branch 'jc/merge-refuse-new-root'
"git pull" has been taught to pass --allow-unrelated-histories
option to underlying "git merge".
* jc/merge-refuse-new-root:
pull: pass --allow-unrelated-histories to "git merge"
t3033: avoid 'ambiguous refs' warning
Diffstat (limited to 't/t3033-merge-toplevel.sh')
| -rwxr-xr-x | t/t3033-merge-toplevel.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3033-merge-toplevel.sh b/t/t3033-merge-toplevel.sh index c1379b00c2..d314599428 100755 --- a/t/t3033-merge-toplevel.sh +++ b/t/t3033-merge-toplevel.sh @@ -19,7 +19,7 @@ test_expect_success setup ' test_commit three && git checkout right && test_commit four && - git checkout --orphan five && + git checkout --orphan newroot && test_commit five && git checkout master ' |