]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Reintegrate: allow regeneration of test integration on a detached HEAD
authorJunio C Hamano <gitster@pobox.com>
Wed, 26 May 2010 17:40:59 +0000 (10:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 26 May 2010 17:40:59 +0000 (10:40 -0700)
Reintegrate

index 151bd59f8f3b0887616124972e4517ebdab8cdc6..602002b6286907f237b2e894a674ca06081ef606 100755 (executable)
@@ -81,11 +81,11 @@ LF='
 
 show_merge () {
        case "$msg" in
-       "Merge branch '"*"'"*" into "*)
+       "Merge branch '"*"'"*)
                branch=$(expr "$msg" : "Merge branch '\(.*\)'")
                merge_hier=heads/
                ;;
-       "Merge remote branch '"*"'"*" into "*)
+       "Merge remote branch '"*"'"*)
                branch=$(expr "$msg" : "Merge remote branch '\(.*\)'")
                merge_hier=
                ;;