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

Merge branch 'mc/commit-doc-grammofix' into maint

2015-06-16T21:33:49Z

Doc grammar fix. * mc/commit-doc-grammofix: Documentation/git-commit: grammofix

Documentation/git-commit: grammofix

2015-05-20T04:20:58Z

Signed-off-by: Michael Coleman Signed-off-by: Junio C Hamano

Documentation: clarify how "git commit" cleans up the edited log message

2015-04-27T18:32:55Z

The `-v` shows a unified diff in the editor to edit the commit message to help the user to describe the change. The diff is stripped and will not become a part of the commit message. Add a note about this with the `-v` description and slightly modify the description for the default `--cleanup` mode. Signed-off-by: Fredrik Gustafsson Signed-off-by: Junio C Hamano

Merge branch 'nd/config-doc-camelCase'

2015-03-23T18:28:12Z

Documentation updates. * nd/config-doc-camelCase: *config.txt: stick to camelCase naming convention

*config.txt: stick to camelCase naming convention

2015-03-14T05:13:46Z

This should improve readability. Compare "thislongname" and "thisLongName". The following keys are left in unchanged. We can decide what to do with them later. - am.keepcr - core.autocrlf .safecrlf .trustctime - diff.dirstat .noprefix - gitcvs.usecrlfattr - gui.blamehistoryctx .trustmtime - pull.twohead - receive.autogc - sendemail.signedoffbycc .smtpsslcertpath .suppresscc Helped-by: Eric Sunshine Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Eric Sunshine Signed-off-by: Junio C Hamano

commit/status: show the index-worktree diff with -v -v

2015-03-06T18:51:48Z

git commit and git status in long format show the diff between HEAD and the index when given -v. This allows previewing a commit to be made. They also list tracked files with unstaged changes, but without a diff. Introduce '-v -v' which shows the diff between the index and the worktree in addition to the HEAD index diff. This allows a review of unstaged changes which might be missing from the commit. In the case of '-v -v', additonal header lines Changes to be committed: and Changes not staged for commit: are inserted before the diffs, which are equal to those in the status part; the latter preceded by 50*"-" to make it stick out more. Signed-off-by: Michael J Gruber Signed-off-by: Junio C Hamano

Merge branch 'jc/doc-commit-only'

2014-11-18T18:19:42Z

* jc/doc-commit-only: Documentation/git-commit: clarify that --only/--include records the working tree contents

Documentation/git-commit: clarify that --only/--include records the working tree contents

2014-11-07T19:57:57Z

With the original phrasing, it is possible to misunderstand as if the contents in the index for only the specified paths are made into the new commit. Signed-off-by: Junio C Hamano

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