undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bk/document-commit-tree-S'

Browse Source 
* bk/document-commit-tree-S:
  commit-tree: document -S option consistently
This commit is contained in:
Junio C Hamano 2013-04-02 15:09:43 -07:00
commit c5f05b2356
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Documentation/git-commit-tree.txt
View File

@ -10,7 +10,9 @@ SYNOPSIS
-------- --------
[verse] [verse]
'git commit-tree' <tree> [(-p <parent>)...] < changelog '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 DESCRIPTION
----------- -----------
@ -52,6 +54,9 @@ OPTIONS
Read the commit log message from the given file. Use `-` to read Read the commit log message from the given file. Use `-` to read
from the standard input. from the standard input.
-S[<keyid>]::
GPG-sign commit.
Commit Information Commit Information
------------------ ------------------

2
builtin/commit-tree.c
View File

@ -10,7 +10,7 @@
#include "utf8.h" #include "utf8.h"
#include "gpg-interface.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) static void new_parent(struct commit *parent, struct commit_list **parents_p)
{ {