From: Jonathan Nieder <jrnieder@gmail.com>
Date: Mon, 09 Nov 2009 15:04:53 GMT
Subject: [PATCH 13/24] Show usage string for 'git merge-one-file -h'
Message-ID: <1257779104-23884-13-git-send-email-jrnieder@gmail.com>
In-Reply-To: <20091109150235.GA23871@progeny.tock>

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
 git-merge-one-file.sh |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
index 9c2c1b7..d067894 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
-- 
1.6.5.2