summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 95b7a41)
raw | patch | inline | side by side (parent: 95b7a41)
author | Yann Dirson <ydirson@altern.org> | |
Fri, 1 Oct 2010 21:19:19 +0000 (23:19 +0200) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Wed, 6 Oct 2010 20:46:02 +0000 (13:46 -0700) |
Signed-off-by: Yann Dirson <ydirson@altern.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t3415-rebase-autosquash.sh | patch | blob | history |
index 37cb89ab53055099db3d5f774d00ade1c4da6c69..fd2184ce7159122ae8d1d65f5a228a7b91c5e02a 100755 (executable)
echo 1 >file1 &&
git add -u &&
test_tick &&
- git commit -m "fixup! first"
+ git commit -m "fixup! first" &&
git tag $1 &&
test_tick &&
echo 1 >file1 &&
git add -u &&
test_tick &&
- git commit -m "squash! first"
+ git commit -m "squash! first" &&
git tag $1 &&
test_tick &&
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^^^ &&