summaryrefslogtreecommitdiff
path: root/builtin/commit-tree.c
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-03-25 21:00:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-03-25 22:01:22 (GMT)
commitdf45cb3ea31eee8ad1c763d1b8a35da87366017f (patch)
tree20803224967a35f1e542dc8e6a64028b27e3299f /builtin/commit-tree.c
parent7b592fadf1e23b10b913e0771b9f711770597266 (diff)
downloadgit-df45cb3ea31eee8ad1c763d1b8a35da87366017f.zip
git-df45cb3ea31eee8ad1c763d1b8a35da87366017f.tar.gz
git-df45cb3ea31eee8ad1c763d1b8a35da87366017f.tar.bz2
commit-tree: document -S option consistently
Commit ba3c69a9 (commit: teach --gpg-sign option, 2011-10-05) added the -S option but documented it in the command usage without indicating that the value is optional and forgot to mention it in the manpage. Later commit 098bbdc3 (Add -S, --gpg-sign option to manpage of "git commit", 2012-10-21) documented the option in the porcelain manpage. Use wording from the porcelain manpage to document the option in the plumbing manpage. Also update the commit-tree usage summary to indicate that the -S value is optional to be consistent with the manpage and with the implementation. Signed-off-by: Brad King <brad.king@kitware.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/commit-tree.c')
-rw-r--r--builtin/commit-tree.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/commit-tree.c b/builtin/commit-tree.c
index eac901a..f641ff2 100644
--- a/builtin/commit-tree.c
+++ b/builtin/commit-tree.c
@@ -10,7 +10,7 @@
#include "utf8.h"
#include "gpg-interface.h"
-static const char commit_tree_usage[] = "git commit-tree [(-p <sha1>)...] [-S<signer>] [-m <message>] [-F <file>] <sha1> <changelog";
+static const char commit_tree_usage[] = "git commit-tree [(-p <sha1>)...] [-S[<keyid>]] [-m <message>] [-F <file>] <sha1> <changelog";
static void new_parent(struct commit *parent, struct commit_list **parents_p)
{