X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-pull-script;h=90ee0f322d8c569a5b02b3be1548eb990b4263c9;hb=180926636e47ecfe28d03cec493af75899994f0f;hp=a4ca97c64566419a0dc02e8e719333d1c9240edc;hpb=ed37b5b2b94398f3ab8312dfdf23cfd25549e3ec;p=git.git

diff --git a/git-pull-script b/git-pull-script
index a4ca97c6..90ee0f32 100755
--- a/git-pull-script
+++ b/git-pull-script
@@ -6,9 +6,7 @@ merge_name=$(echo "$1" | sed 's:\.git/*$::')
 merge_head=HEAD
 if [ "$2" ]
 then
-   merge_name="'$2' branch from
-
-	$merge_name"
+   merge_name="'$2' branch of $merge_name"
    merge_head="refs/heads/$2"
 fi
 
@@ -19,5 +17,5 @@ git-fetch-script "$merge_repo" "$merge_head" || exit 1
 
 git-resolve-script \
 	"$(cat "$GIT_DIR"/HEAD)" \
-	"$(cat "$GIT_DIR"/MERGE_HEAD)" \
+	"$(cat "$GIT_DIR"/FETCH_HEAD)" \
 	"$merge_name"