From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 25 Jun 2012 18:24:42 +0000 (-0700)
Subject: Merge branch 'rr/doc-commit'
X-Git-Tag: v1.7.12-rc0~85
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/45362148fa7a1b01ec5b7959c3e3174bd5af7e17?ds=inline;hp=-c

Merge branch 'rr/doc-commit'

* rr/doc-commit:
commit: document a couple of options
---

45362148fa7a1b01ec5b7959c3e3174bd5af7e17
diff --combined Documentation/git-commit.txt
index 2d695f619c,441c2087b9..f400835921
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@@ -42,7 -42,7 +42,7 @@@ The content to be added can be specifie
  
  5. by using the --interactive or --patch switches with the 'commit' command
     to decide one by one which files or hunks should be part of the commit,
 -   before finalizing the operation. See the ``Interactive Mode`` section of
 +   before finalizing the operation. See the ``Interactive Mode'' section of
     linkgit:git-add[1] to learn how to operate these modes.
  
  The `--dry-run` option can be used to obtain a
@@@ -101,12 -101,16 +101,16 @@@ OPTION
  	When doing a dry-run, give the output in the short-format. See
  	linkgit:git-status[1] for details. Implies `--dry-run`.
  
+ --branch::
+ 	Show the branch and tracking info even in short-format.
+ 
  --porcelain::
  	When doing a dry-run, give the output in a porcelain-ready
  	format. See linkgit:git-status[1] for details. Implies
  	`--dry-run`.
  
  -z::
+ --null::
  	When showing `short` or `porcelain` status output, terminate
  	entries in the status output with NUL, instead of LF. If no
  	format is given, implies the `--porcelain` output format.
@@@ -189,6 -193,10 +193,10 @@@
  	current tip -- if it was a merge, it will have the parents of
  	the current tip as parents -- so the current top commit is
  	discarded.
+ 
+ --no-post-rewrite::
+ 	Bypass the post-rewrite hook.
+ 
  +
  --
  It is a rough equivalent for:
@@@ -287,7 -295,7 +295,7 @@@ When recording your own work, the conte
  your working tree are temporarily stored to a staging area
  called the "index" with 'git add'.  A file can be
  reverted back, only in the index but not in the working tree,
 -to that of the last commit with `git reset HEAD \-- <file>`,
 +to that of the last commit with `git reset HEAD -- <file>`,
  which effectively reverts 'git add' and prevents the changes to
  this file from participating in the next commit.  After building
  the state to be committed incrementally with these commands,