Andrew's git / gitweb.git / diff
?
git-merge-one-file: use a lowercase "usage:" string
authorDavid Aguilar <davvid@gmail.com>
Sun, 24 Feb 2013 00:50:12 +0000 (16:50 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 24 Feb 2013 21:31:06 +0000 (13:31 -0800)
Make the usage string consistent with Git.

Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-merge-one-file.sh patch | blob | history
diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
index f612cb847aca981e16cb6006fa08d870497c6263..3373c040d4aae221386fac5ec2cd9a29344c1840 100755 (executable)
--- a/git-merge-one-file.sh
+++ b/git-merge-one-file.sh
@@ -18,7 +18,7 @@
 
 USAGE='<orig blob> <our blob> <their blob> <path>'
 USAGE="$USAGE <orig mode> <our mode> <their mode>"
-LONG_USAGE="Usage: git merge-one-file $USAGE
+LONG_USAGE="usage: git merge-one-file $USAGE
 
 Blob ids and modes should be empty for missing files."