projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
repo-config: give value_ a sane default so regexec won't segfault
[git.git]
/
git-resolve.sh
diff --git
a/git-resolve.sh
b/git-resolve.sh
index
9263070
..
b53ede8
100755
(executable)
--- a/
git-resolve.sh
+++ b/
git-resolve.sh
@@
-50,6
+50,9
@@
case "$common" in
;;
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='
'