From: Jonathan Nieder <jrnieder@gmail.com>
Date: Mon, 9 Nov 2009 15:04:53 +0000 (-0600)
Subject: Show usage string for 'git merge-one-file -h'
X-Git-Tag: v1.6.6-rc0~34^2~11
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ae5bdda36cddeb837dc43804966bc99baa385772;p=git.git

Show usage string for 'git merge-one-file -h'

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
index 9c2c1b720..d067894bf 100755
--- a/git-merge-one-file.sh
+++ b/git-merge-one-file.sh
@@ -16,6 +16,18 @@
 # been handled already by git read-tree, but that one doesn't
 # do any merges that might change the tree layout.
 
+USAGE='<orig blob> <our blob> <their blob> <path>'
+USAGE="$USAGE <orig mode> <our mode> <their mode>"
+LONG_USAGE="Usage: git merge-one-file $USAGE
+
+Blob ids and modes should be empty for missing files."
+
+if ! test "$#" -eq 7
+then
+	echo "$LONG_USAGE"
+	exit 1
+fi
+
 case "${1:-.}${2:-.}${3:-.}" in
 #
 # Deleted in both or deleted in one and unchanged in the other