mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  t/t3415: use && where applicable.
  SubmittingPatches: Document some extra tags used in commit messages
This commit is contained in:
Junio C Hamano
2010-10-06 13:49:45 -07:00
parent 8520913cc5 7c6eafa35a
commit c752e7f3e8
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
t/t3415-rebase-autosquash.sh
View File

@ -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^^^ &&