Sync with 1.7.4.3

diff --git a/git-pull.sh b/git-pull.sh
index 63b063a7b284bac5b10a9bd6fe879e5717bee2f3..e31226b62fb8b50d918b1e418bb1607f24070bd0 100755 (executable)
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -274,7 +274,7 @@ esac
 if test -z "$orig_head"
 then
        git update-ref -m "initial pull" HEAD $merge_head "$curr_head" &&
-       git read-tree --reset -u HEAD || exit 1
+       git read-tree -m -u HEAD || exit 1
        exit
 fi