diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-04-02 15:09:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-02 15:09:43 -0700 |
| commit | c5f05b23562be8c0e4ddfe9ca89720f611836a28 (patch) | |
| tree | df61d6f97b5fe6a6c93123393343f223bffb7458 | |
| parent | 5fb7b899fb7e34e962556e6623bbfa8e5c035e62 (diff) | |
| parent | df45cb3ea31eee8ad1c763d1b8a35da87366017f (diff) | |
| download | git-c5f05b23562be8c0e4ddfe9ca89720f611836a28.tar.gz | |
Merge branch 'bk/document-commit-tree-S'
* bk/document-commit-tree-S:
commit-tree: document -S option consistently
| -rw-r--r-- | Documentation/git-commit-tree.txt | 7 | ||||
| -rw-r--r-- | builtin/commit-tree.c | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/Documentation/git-commit-tree.txt b/Documentation/git-commit-tree.txt index 86ef56e7c8..cafdc9642d 100644 --- a/Documentation/git-commit-tree.txt +++ b/Documentation/git-commit-tree.txt @@ -10,7 +10,9 @@ SYNOPSIS -------- [verse] 'git commit-tree' <tree> [(-p <parent>)...] < changelog -'git commit-tree' [(-p <parent>)...] [(-m <message>)...] [(-F <file>)...] <tree> +'git commit-tree' [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] + [(-F <file>)...] <tree> + DESCRIPTION ----------- @@ -52,6 +54,9 @@ OPTIONS Read the commit log message from the given file. Use `-` to read from the standard input. +-S[<keyid>]:: + GPG-sign commit. + Commit Information ------------------ 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) { |