summaryrefslogtreecommitdiff
path: root/git-merge-one-file.sh
diff options
context:
space:
mode:
authorDavid Aguilar <davvid@gmail.com>2013-02-23 16:50:12 -0800
committerJunio C Hamano <gitster@pobox.com>2013-02-24 13:31:06 -0800
commite5a1518ef40aea657aec64c1507553bde6fac105 (patch)
treebb0519b2f677d6c81742d6f56f827377712a1e82 /git-merge-one-file.sh
parent8d8bbc3644aedf1a189ded0d866311e5a0da1ec8 (diff)
downloadgit-e5a1518ef40aea657aec64c1507553bde6fac105.tar.gz
git-merge-one-file: use a lowercase "usage:" string
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>
Diffstat (limited to 'git-merge-one-file.sh')
-rwxr-xr-xgit-merge-one-file.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
index f612cb847a..3373c040d4 100755
--- 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."