Thread (12 messages) flat view 12 messages, 5 authors, 2016-06-15
DORMANTno replies

[PATCH 1/5] git-commit.txt: Add missing long/short options

From: Stephan Beyer <hidden>
Date: 2016-06-15 22:44:42
Subsystem: documentation, the rest · Maintainers: Jonathan Corbet, Linus Torvalds

And split the "-c or -C <commit>" item into two separate items.

Signed-off-by: Stephan Beyer <redacted>
---
Hi,

so here's the first one ;-)

 Documentation/git-commit.txt |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 40bf63e..a94b4e3 100644
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -57,14 +57,16 @@ OPTIONS
 	been modified and deleted, but new files you have not
 	told git about are not affected.
 
--c or -C <commit>::
+-C <commit>|--reuse-message=<commit>::
 	Take existing commit object, and reuse the log message
 	and the authorship information (including the timestamp)
-	when creating the commit.  With '-C', the editor is not
-	invoked; with '-c' the user can further edit the commit
-	message.
+	when creating the commit.
 
--F <file>::
+-c <commit>|--reedit-message=<commit>::
+	Like '-C', but with '-c' the editor is invoked, so that
+	the user can further edit the commit message.
+
+-F <file>|--file=<file>::
 	Take the commit message from the given file.  Use '-' to
 	read the message from the standard input.
 
@@ -85,7 +87,7 @@ OPTIONS
 -s|--signoff::
 	Add Signed-off-by line at the end of the commit message.
 
---no-verify::
+-n|--no-verify::
 	This option bypasses the pre-commit and commit-msg hooks.
 	See also linkgit:githooks[5][hooks].
 
@@ -112,7 +114,6 @@ OPTIONS
 	further edit the message taken from these sources.
 
 --amend::
-
 	Used to amend the tip of the current branch. Prepare the tree
 	object you would want to replace the latest commit as usual
 	(this includes the usual -i/-o and explicit paths), and the
-- 
1.5.5.1
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help