diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-03-24 01:38:22 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-24 07:38:04 +0100 |
| commit | 1c2c6112a4bf655faa768ddfca067945edf2809e (patch) | |
| tree | 985973c2d5ac3611db6e25f702eecacf7cb41939 /git-merge.sh | |
| parent | t6004: add a bit more path optimization test. (diff) | |
| parent | Merge branch 'maint' (diff) | |
| download | git-1c2c6112a4bf655faa768ddfca067945edf2809e.tar.xz git-1c2c6112a4bf655faa768ddfca067945edf2809e.zip | |
Merge branch 'master' into jc/bisect
This is to merge in the fix for path-limited bisection
from the 'master' branch.
Diffstat (limited to 'git-merge.sh')
| -rwxr-xr-x | git-merge.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/git-merge.sh b/git-merge.sh index 8759c5a7e0..fa4589173f 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -108,6 +108,10 @@ merge_name () { git-show-ref -q --verify "refs/heads/$truname" 2>/dev/null then echo "$rh branch '$truname' (early part) of ." + elif test "$remote" = "FETCH_HEAD" -a -r "$GIT_DIR/FETCH_HEAD" + then + sed -e 's/ not-for-merge / /' -e 1q \ + "$GIT_DIR/FETCH_HEAD" else echo "$rh commit '$remote'" fi |