X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-pull-script;h=8e309fc98b97659d08061b0e1f1e6d4f1e43fc32;hb=cf219196a89becccb50ad4a0a667a2814ddae60f;hp=0ef6be3547fe75b1758120161e1e3318b56ee6f4;hpb=b33e9666082ce692e64ccfd688dc2a5075566f75;p=git.git diff --git a/git-pull-script b/git-pull-script index 0ef6be35..8e309fc9 100755 --- a/git-pull-script +++ b/git-pull-script @@ -22,4 +22,4 @@ git-fetch-script "$merge_repo" "$merge_head" || exit 1 git-resolve-script \ "$(cat "$GIT_DIR"/HEAD)" \ "$(cat "$GIT_DIR"/FETCH_HEAD)" \ - "$merge_name" + "Merge $merge_name"