Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Print out the edge commits for each packfile in fast-import.
[gitweb.git]
/
git-pull.sh
diff --git
a/git-pull.sh
b/git-pull.sh
index c184fb81a4dab622d79120bcc986c3bf2b07df7f..e9826fc4cec14d82171f495af25324b24fe9f19b 100755
(executable)
--- a/
git-pull.sh
+++ b/
git-pull.sh
@@
-8,6
+8,7
@@
USAGE='[-n | --no-summary] [--no-commit] [-s strategy]... [<fetch-options>] <rep
LONG_USAGE='Fetch one or more remote refs and merge it/them into the current HEAD.'
. git-sh-setup
set_reflog_action "pull $*"
+require_work_tree
test -z "$(git ls-files -u)" ||
die "You are in a middle of conflicted merge."