Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
recur vs recursive: help testing without touching too many stuff.
During git-merge-recur development, you could set an environment variable GIT_USE_RECUR_FOR_RECURSIVE to use WIP recur in place of the recursive strategy. Signed-off-by: Junio C Hamano <junkio@cox.net>
- Loading branch information
Junio C Hamano
committed
Jul 14, 2006
1 parent
6d297f8
commit 06d30f4
Showing
4 changed files
with
36 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,14 @@ | ||
#!/bin/sh -x | ||
|
||
cd t || exit | ||
./t3400-rebase.sh "$@" && \ | ||
./t6020-merge-df.sh "$@" && \ | ||
./t3401-rebase-partial.sh "$@" && \ | ||
./t6021-merge-criss-cross.sh "$@" && \ | ||
./t3402-rebase-merge.sh "$@" && \ | ||
./t6022-merge-rename.sh "$@" && \ | ||
./t6010-merge-base.sh "$@" && \ | ||
GIT_USE_RECUR_FOR_RECURSIVE=LetsTryIt | ||
export GIT_USE_RECUR_FOR_RECURSIVE | ||
|
||
./t3400-rebase.sh "$@" && | ||
./t6020-merge-df.sh "$@" && | ||
./t3401-rebase-partial.sh "$@" && | ||
./t6021-merge-criss-cross.sh "$@" && | ||
./t3402-rebase-merge.sh "$@" && | ||
./t6022-merge-rename.sh "$@" && | ||
./t6010-merge-base.sh "$@" && | ||
: |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters