dilim/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-08-09 17:40:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reintegrate: allow regeneration of test integration on a detached HEAD

Browse Source
This commit is contained in:
Junio C Hamano
2010-05-26 10:40:59 -07:00
parent 17bd783f39
commit 9ef638879b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Reintegrate
View File

@@ -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=
;;