diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-04-08 11:59:27 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-04-08 11:59:27 -0700 |
commit | b5a52fa6c694c891a259233b29eb0ef4a47db57b (patch) | |
tree | 58fcebb324b516f3076589ff77519c8733b9f75b /Documentation/git-commit.txt | |
parent | bdb830c44567ebbdec497e6af21b87d4e43539cc (diff) | |
parent | b6c2a0d45d4165dfd326bd7a28e66d9cedb8ae84 (diff) | |
download | git-b5a52fa6c694c891a259233b29eb0ef4a47db57b.tar.gz |
Merge branch 'jc/rev-parse-argh-dashed-multi-words'
Make sure that the help text given to describe the "<param>" part
of the "git cmd --option=<param>" does not contain SP or _,
e.g. "--gpg-sign=<key-id>" option for "git commit" is not spelled
as "--gpg-sign=<key id>".
* jc/rev-parse-argh-dashed-multi-words:
parse-options: make sure argh string does not have SP or _
update-index: teach --cacheinfo a new syntax "mode,sha1,path"
parse-options: multi-word argh should use dash to separate words
Diffstat (limited to 'Documentation/git-commit.txt')
-rw-r--r-- | Documentation/git-commit.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index 429267abf6..0bbc8f55f9 100644 --- a/Documentation/git-commit.txt +++ b/Documentation/git-commit.txt @@ -13,7 +13,7 @@ SYNOPSIS [-F <file> | -m <msg>] [--reset-author] [--allow-empty] [--allow-empty-message] [--no-verify] [-e] [--author=<author>] [--date=<date>] [--cleanup=<mode>] [--[no-]status] - [-i | -o] [-S[<keyid>]] [--] [<file>...] + [-i | -o] [-S[<key-id>]] [--] [<file>...] DESCRIPTION ----------- |