aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2009-11-09 09:04:53 -0600
committerJunio C Hamano <gitster@pobox.com>2009-11-10 11:06:57 -0800
commitae5bdda36cddeb837dc43804966bc99baa385772 (patch)
tree219eb86d11b1bf4ad79a58eb69db460ebb4ae0e4
parentaa481d38b059a093829bbe0745e29244a896c499 (diff)
downloadgit-ae5bdda36cddeb837dc43804966bc99baa385772.tar.gz
git-ae5bdda36cddeb837dc43804966bc99baa385772.tar.xz
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>
-rwxr-xr-xgit-merge-one-file.sh12
1 files changed, 12 insertions, 0 deletions
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