X-Git-Url: https://git.octo.it/?p=git.git;a=blobdiff_plain;f=git-resolve.sh;h=1c7aaefa2528b73fea3eee22b086b94fa91854c5;hp=7d8fb54f952e3f85c8c77b8fd9c67afbe76f0316;hb=HEAD;hpb=1301c6eb412e7c5511b952a12e42c70ad56f028b diff --git a/git-resolve.sh b/git-resolve.sh index 7d8fb54f..1c7aaefa 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" \ @@ -43,7 +41,7 @@ case "$common" in exit 0 ;; "$head") - echo "Updating from $head to $merge." + echo "Updating from $head to $merge" git-read-tree -u -m $head $merge || exit 1 git-update-ref HEAD "$merge" "$head" git-diff-tree -p $head $merge | git-apply --stat @@ -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=' '