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>
Jonathan Nieder committed
Nov 9, 2009 at 09:04 UTC
ae5bdda36cddeb837dc43804966bc99baa385772
1 file changed
+12
git-merge-one-file.sh
+12
@@ -16,6 +16,18 @@
16
# been handled already by git read-tree, but that one doesn't
17
# do any merges that might change the tree layout.
18
19
+USAGE='<orig blob> <our blob> <their blob> <path>'
20
+USAGE="$USAGE <orig mode> <our mode> <their mode>"
21
+LONG_USAGE="Usage: git merge-one-file $USAGE
22
+
23
+Blob ids and modes should be empty for missing files."
24
+
25
+if ! test "$#" -eq 7
26
+then
27
+ echo "$LONG_USAGE"
28
+ exit 1
29
+fi
30
+
31
case "${1:-.}${2:-.}${3:-.}" in
32
#
33
# Deleted in both or deleted in one and unchanged in the other