diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-04-08 18:59:27 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-04-08 18:59:27 (GMT) |
commit | b5a52fa6c694c891a259233b29eb0ef4a47db57b (patch) | |
tree | 58fcebb324b516f3076589ff77519c8733b9f75b /Documentation/git-revert.txt | |
parent | bdb830c44567ebbdec497e6af21b87d4e43539cc (diff) | |
parent | b6c2a0d45d4165dfd326bd7a28e66d9cedb8ae84 (diff) | |
download | git-b5a52fa6c694c891a259233b29eb0ef4a47db57b.zip git-b5a52fa6c694c891a259233b29eb0ef4a47db57b.tar.gz git-b5a52fa6c694c891a259233b29eb0ef4a47db57b.tar.bz2 |
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-revert.txt')
-rw-r--r-- | Documentation/git-revert.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-revert.txt b/Documentation/git-revert.txt index 9eb83f0..cceb5f2 100644 --- a/Documentation/git-revert.txt +++ b/Documentation/git-revert.txt @@ -8,7 +8,7 @@ git-revert - Revert some existing commits SYNOPSIS -------- [verse] -'git revert' [--[no-]edit] [-n] [-m parent-number] [-s] [-S[<keyid>]] <commit>... +'git revert' [--[no-]edit] [-n] [-m parent-number] [-s] [-S[<key-id>]] <commit>... 'git revert' --continue 'git revert' --quit 'git revert' --abort @@ -80,8 +80,8 @@ more details. This is useful when reverting more than one commits' effect to your index in a row. --S[<keyid>]:: ---gpg-sign[=<keyid>]:: +-S[<key-id>]:: +--gpg-sign[=<key-id>]:: GPG-sign commits. -s:: |