Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
xread/xwrite: do not worry about EINTR at calling sites.
[gitweb.git]
/
git-resolve.sh
diff --git
a/git-resolve.sh
b/git-resolve.sh
index 7d8fb54f952e3f85c8c77b8fd9c67afbe76f0316..926307005493b7c8c4253b1adff34bdb4bc57b77 100755
(executable)
--- a/
git-resolve.sh
+++ b/
git-resolve.sh
@@
-4,11
+4,9
@@
#
# Resolve two trees.
#
-. git-sh-setup || die "Not a git archive"
-usage () {
- die "git-resolve <head> <remote> <merge-message>"
-}
+USAGE='<head> <remote> <merge-message>'
+. git-sh-setup
dropheads() {
rm -f -- "$GIT_DIR/MERGE_HEAD" \