projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix'
[git.git]
/
git-resolve.sh
diff --git
a/git-resolve.sh
b/git-resolve.sh
index
fcc5ad7
..
b53ede8
100755
(executable)
--- a/
git-resolve.sh
+++ b/
git-resolve.sh
@@
-4,11
+4,9
@@
#
# Resolve two trees.
#
#
# Resolve two trees.
#
-. git-sh-setup
-usage () {
- die "git-resolve <head> <remote> <merge-message>"
-}
+USAGE='<head> <remote> <merge-message>'
+. git-sh-setup
dropheads() {
rm -f -- "$GIT_DIR/MERGE_HEAD" \
dropheads() {
rm -f -- "$GIT_DIR/MERGE_HEAD" \
@@
-52,6
+50,9
@@
case "$common" in
;;
esac
;;
esac
+# We are going to make a new commit.
+git var GIT_COMMITTER_IDENT >/dev/null || exit
+
# Find an optimum merge base if there are more than one candidates.
LF='
'
# Find an optimum merge base if there are more than one candidates.
LF='
'