Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
rebase -m: Fix incorrect short-logs of already applied commits.
[gitweb.git]
/
t
/
t3403-rebase-skip.sh
diff --git
a/t/t3403-rebase-skip.sh
b/t/t3403-rebase-skip.sh
index 9e11ed295d02f760f01a5b4fcb371b17a5b710cf..eab053c3e0e1cbe82bc7824d43109ba56acdb54d 100755
(executable)
--- a/
t/t3403-rebase-skip.sh
+++ b/
t/t3403-rebase-skip.sh
@@
-49,7
+49,7
@@
test_expect_success 'rebase --skip with --merge' '
'
test_expect_success 'merge and reference trees equal' \
- 'test -z "`git
-
diff-tree skip-merge skip-reference`"'
+ 'test -z "`git
diff-tree skip-merge skip-reference`"'
test_debug 'gitk --all & sleep 1'