diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-03-20 06:16:08 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-03-20 06:16:08 (GMT) |
commit | 0c45fa32ec87b15fd828bcbfc41d0d2349b4e7ad (patch) | |
tree | d5b89f725b7eea211471cab1fae3a8a63e868e05 /Documentation | |
parent | f6c75e392e2d8426b622408ae74f0e2b545609a7 (diff) | |
parent | cbdeab98e871bfbb45cf5095cc804ebb07054eba (diff) | |
download | git-0c45fa32ec87b15fd828bcbfc41d0d2349b4e7ad.zip git-0c45fa32ec87b15fd828bcbfc41d0d2349b4e7ad.tar.gz git-0c45fa32ec87b15fd828bcbfc41d0d2349b4e7ad.tar.bz2 |
Merge branch 'br/commit-tree-parseopt'
The command line parser of "git commit-tree" has been rewritten to
use the parse-options API.
* br/commit-tree-parseopt:
commit-tree: utilize parse-options api
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/git-commit-tree.txt | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Documentation/git-commit-tree.txt b/Documentation/git-commit-tree.txt index 002dae6..4b90b9c 100644 --- a/Documentation/git-commit-tree.txt +++ b/Documentation/git-commit-tree.txt @@ -23,6 +23,10 @@ Creates a new commit object based on the provided tree object and emits the new commit object id on stdout. The log message is read from the standard input, unless `-m` or `-F` options are given. +The `-m` and `-F` options can be given any number of times, in any +order. The commit log message will be composed in the order in which +the options are given. + A commit object may have any number of parents. With exactly one parent, it is an ordinary commit. Having more than one parent makes the commit a merge between several lines of history. Initial (root) @@ -41,7 +45,7 @@ state was. OPTIONS ------- <tree>:: - An existing tree object + An existing tree object. -p <parent>:: Each `-p` indicates the id of a parent commit object. @@ -52,7 +56,8 @@ OPTIONS -F <file>:: Read the commit log message from the given file. Use `-` to read - from the standard input. + from the standard input. This can be given more than once and the + content of each file becomes its own paragraph. -S[<keyid>]:: --gpg-sign[=<keyid>]:: |