Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
worktree: allow to (re)move worktrees with uninitialized submodules
[gitweb.git]
/
t
/
t3410-rebase-preserve-dropped-merges.sh
diff --git
a/t/t3410-rebase-preserve-dropped-merges.sh
b/t/t3410-rebase-preserve-dropped-merges.sh
index 6f73b95558c85264d073d42f67c407967c4d5c69..2e29866993ce80a19ecbef55e6dab829009b0a11 100755
(executable)
--- a/
t/t3410-rebase-preserve-dropped-merges.sh
+++ b/
t/t3410-rebase-preserve-dropped-merges.sh
@@
-11,6
+11,11
@@
rewritten.
'
. ./test-lib.sh
+if ! test_have_prereq REBASE_P; then
+ skip_all='skipping git rebase -p tests, as asked for'
+ test_done
+fi
+
# set up two branches like this:
#
# A - B - C - D - E