![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Sun, 9 Jul 2006 07:42:26 +0000 (00:42 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Fri, 14 Jul 2006 06:10:19 +0000 (23:10 -0700) | ||
| commit | 06d30f4f3eea71bce4cf48db3ea384976b3983b7 | |
| tree | f3b1d0ba712cc976dba5bc1d7d9dc5f104d81bee | tree | snapshot |
| parent | 6d297f81373e19d86b8f02cb68120201d1b0ab1d | commit | diff |
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>
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>
| TEST | diff | blob | history | |
| git-merge.sh | diff | blob | history | |
| git-rebase.sh | diff | blob | history | |
| t/t3402-rebase-merge.sh | diff | blob | history |