git/Documentation/git-commit.txt, branch v2.0.2

Merge branch 'jc/rev-parse-argh-dashed-multi-words'

2014-04-08T18:59:27Z

Make sure that the help text given to describe the "" part of the "git cmd --option=" does not contain SP or _, e.g. "--gpg-sign=" option for "git commit" is not spelled as "--gpg-sign=". * jc/rev-parse-argh-dashed-multi-words: parse-options: make sure argh string does not have SP or _ update-index: teach --cacheinfo a new syntax "mode,sha1,path" parse-options: multi-word argh should use dash to separate words

Merge branch 'nd/commit-editor-cleanup'

2014-03-25T18:07:48Z

"git commit --cleanup=" learned a new mode, scissors. * nd/commit-editor-cleanup: commit: add --cleanup=scissors wt-status.c: move cut-line print code out to wt_status_add_cut_line wt-status.c: make cut_line[] const to shrink .data section a bit

parse-options: multi-word argh should use dash to separate words

2014-03-24T17:43:34Z

"When you need to use space, use dash" is a strange way to say that you must not use a space. Because it is more common for the command line descriptions to use dashed-multi-words, you do not even want to use spaces in these places. Rephrase the documentation to avoid this strangeness. Fix a few existing multi-word argument help strings, i.e. - GPG key-ids given to -S/--gpg-sign are "key-id"; - Refs used for storing notes are "notes-ref"; and - Expiry timestamps given to --expire are "expiry-date". and update the corresponding documentation pages. Signed-off-by: Junio C Hamano

commit: add --cleanup=scissors

2014-02-25T17:35:20Z

Since 1a72cfd (commit -v: strip diffs and submodule shortlogs from the commit message - 2013-12-05) we have a less fragile way to cut out "git status" at the end of a commit message but it's only enabled for stripping submodule shortlogs. Add new cleanup option that reuses the same mechanism for the entire "git status" without accidentally removing lines starting with '#'. Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano

commit-tree: add and document --no-gpg-sign

2014-02-24T22:51:35Z

Document how to override commit.gpgsign configuration that is set to true per "git commit" invocation (parse-options machinery lets us say "--no-gpg-sign" to do so). "git commit-tree" does not use parse-options, so manually add the corresponding option for now. Signed-off-by: Junio C Hamano

documentation: trivial style cleanups

2013-05-17T19:09:21Z

White-spaces, missing braces, standardize --[no-]foo. Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano

Documentation/git-commit: Typo under --edit

2013-05-02T19:03:40Z

-C takes a commit object, not a file. Signed-off-by: Anders Granskogen Bjørnstad Signed-off-by: Junio C Hamano

Merge branch 'cn/commit-amend-doc' into maint

2013-04-12T20:41:47Z

* cn/commit-amend-doc: Documentation/git-commit: reword the --amend explanation

Documentation/git-commit: reword the --amend explanation

2013-04-05T14:40:39Z

The explanation for 'git commit --amend' talks about preparing a tree object, which shouldn't be how user-facing documentation talks about commit. Reword it to say it works as usual, but replaces the current commit. Signed-off-by: Carlos Martín Nieto Signed-off-by: Junio C Hamano

Merge branch 'bc/commit-complete-lines-given-via-m-option' into maint

2013-04-03T16:26:07Z

'git commit -m "$msg"' used to add an extra newline even when $msg already ended with one. * bc/commit-complete-lines-given-via-m-option: Documentation/git-commit.txt: rework the --cleanup section git-commit: only append a newline to -m mesg if necessary t7502: demonstrate breakage with a commit message with trailing newlines t/t7502: compare entire commit message with what was expected