X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-resolve.sh;h=b53ede8d87b7473fb5b5239228008be372797552;hb=c401cb48e77459a4ccad76888ad31bef252facc5;hp=fcc5ad7349e3f77a6817e499b331b262c4a07b57;hpb=93dcab2937624ebb97f91807576cddb242a55a46;p=git.git diff --git a/git-resolve.sh b/git-resolve.sh index fcc5ad73..b53ede8d 100755 --- a/git-resolve.sh +++ b/git-resolve.sh @@ -4,11 +4,9 @@ # # Resolve two trees. # -. git-sh-setup -usage () { - die "git-resolve " -} +USAGE=' ' +. git-sh-setup dropheads() { rm -f -- "$GIT_DIR/MERGE_HEAD" \ @@ -52,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=' '