diff options
| author | David Aguilar <davvid@gmail.com> | 2013-02-24 01:50:12 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-24 22:31:06 +0100 |
| commit | e5a1518ef40aea657aec64c1507553bde6fac105 (patch) | |
| tree | bb0519b2f677d6c81742d6f56f827377712a1e82 /git-merge-one-file.sh | |
| parent | git-relink: use a lowercase "usage:" string (diff) | |
| download | git-e5a1518ef40aea657aec64c1507553bde6fac105.tar.xz git-e5a1518ef40aea657aec64c1507553bde6fac105.zip | |
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-x | git-merge-one-file.sh | 2 |
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." |