Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Git 1.7.4.5
[gitweb.git]
/
git-pull.sh
diff --git
a/git-pull.sh
b/git-pull.sh
index f6b7b8404896c15487044bcfaa64f758faeeef06..c98c0fc32e1c4dd0ab2a5b84d63f63db651190c6 100755
(executable)
--- a/
git-pull.sh
+++ b/
git-pull.sh
@@
-272,7
+272,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