summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-04-02 15:09:43 -0700
committerJunio C Hamano <gitster@pobox.com>2013-04-02 15:09:43 -0700
commitc5f05b23562be8c0e4ddfe9ca89720f611836a28 (patch)
treedf61d6f97b5fe6a6c93123393343f223bffb7458 /builtin
parent5fb7b899fb7e34e962556e6623bbfa8e5c035e62 (diff)
parentdf45cb3ea31eee8ad1c763d1b8a35da87366017f (diff)
downloadgit-c5f05b23562be8c0e4ddfe9ca89720f611836a28.tar.gz
Merge branch 'bk/document-commit-tree-S'
* bk/document-commit-tree-S: commit-tree: document -S option consistently
Diffstat (limited to 'builtin')
-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 eac901a0ee..f641ff2a89 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)
{