X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-resolve.sh;h=b53ede8d87b7473fb5b5239228008be372797552;hb=ce4c8b24a1efcf155c076d54a7e239251504f669;hp=7d8fb54f952e3f85c8c77b8fd9c67afbe76f0316;hpb=3eeb419968c1f8f0a762a7127db770e9d9c8037d;p=git.git diff --git a/git-resolve.sh b/git-resolve.sh index 7d8fb54f..b53ede8d 100755 --- 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 " -} +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=' '