diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-08-06 15:37:09 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-08-06 15:37:09 -0700 |
commit | 809b2625433aef412a3e5b82729175309a35ba20 (patch) | |
tree | 3998a946feef1069cd4c8006f0f20993802a345c | |
parent | 7615cb005bf15abce05cbdde775e5fdf4662d655 (diff) | |
parent | e858af6d501954af07fa3bb7d2cca40b638c75a6 (diff) | |
download | git-809b2625433aef412a3e5b82729175309a35ba20.tar.gz git-809b2625433aef412a3e5b82729175309a35ba20.tar.xz |
Merge branch 'rr/doc-commit' into maint
* rr/doc-commit:
commit: document a couple of options
-rw-r--r-- | Documentation/git-commit.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index 81853e964..4622297ec 100644 --- a/Documentation/git-commit.txt +++ b/Documentation/git-commit.txt @@ -101,12 +101,16 @@ OPTIONS 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 @@ OPTIONS 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: |