diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-10-06 20:49:45 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-10-06 20:49:45 (GMT) |
| commit | c752e7f3e8d96a9673ad248addc9418164bd3ce6 (patch) | |
| tree | 812bbca3530914a49161074d1aa1f4f051737c09 /t | |
| parent | 8520913cc53e03dcc4b4395cdf500ab8e60ed792 (diff) | |
| parent | 7c6eafa35af805578990e76b691ff7f1a25a3c57 (diff) | |
| download | git-c752e7f3e8d96a9673ad248addc9418164bd3ce6.zip git-c752e7f3e8d96a9673ad248addc9418164bd3ce6.tar.gz git-c752e7f3e8d96a9673ad248addc9418164bd3ce6.tar.bz2 | |
Merge branch 'maint'
* maint:
t/t3415: use && where applicable.
SubmittingPatches: Document some extra tags used in commit messages
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3415-rebase-autosquash.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t3415-rebase-autosquash.sh b/t/t3415-rebase-autosquash.sh index 37cb89a..fd2184c 100755 --- a/t/t3415-rebase-autosquash.sh +++ b/t/t3415-rebase-autosquash.sh @@ -26,7 +26,7 @@ test_auto_fixup() { echo 1 >file1 && git add -u && test_tick && - git commit -m "fixup! first" + git commit -m "fixup! first" && git tag $1 && test_tick && @@ -55,7 +55,7 @@ test_auto_squash() { echo 1 >file1 && git add -u && test_tick && - git commit -m "squash! first" + git commit -m "squash! first" && git tag $1 && test_tick && @@ -84,7 +84,7 @@ test_expect_success 'misspelled auto squash' ' echo 1 >file1 && git add -u && test_tick && - git commit -m "squash! forst" + git commit -m "squash! forst" && git tag final-missquash && test_tick && git rebase --autosquash -i HEAD^^^ && |