diff options
Diffstat (limited to 'git-resolve-script')
| -rwxr-xr-x | git-resolve-script | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/git-resolve-script b/git-resolve-script index 4641119..50d5f83 100755 --- a/git-resolve-script +++ b/git-resolve-script @@ -6,21 +6,25 @@ # . git-sh-setup-script || die "Not a git archive" -head=$(git-rev-parse --verify "$1"^0) || exit -merge=$(git-rev-parse --verify "$2"^0) || exit -merge_msg="$3" +usage () { + die "git-resolve-script <head> <remote> <merge-message>" +} dropheads() { rm -f -- "$GIT_DIR/MERGE_HEAD" \ "$GIT_DIR/LAST_MERGE" || exit 1 } +head=$(git-rev-parse --verify "$1"^0) && +merge=$(git-rev-parse --verify "$2"^0) && +merge_msg="$3" || usage + # # The remote name is just used for the message, # but we do want it. # if [ -z "$head" -o -z "$merge" -o -z "$merge_msg" ]; then - die "git-resolve-script <head> <remote> <merge-message>" + usage fi dropheads |