git/Documentation/git-commit.txt, branch v1.8.2.2

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

Merge branch 'maint-1.8.1' into maint

2013-03-27T17:51:10Z

* maint-1.8.1: merge-tree: fix typo in merge-tree.c::unresolved git-commit doc: describe use of multiple `-m` options git-pull doc: fix grammo ("conflicts" is plural)

git-commit doc: describe use of multiple `-m` options

2013-03-27T16:32:02Z

The text is copied from Documentation/git-tag.txt. Signed-off-by: Christian Helmuth Signed-off-by: Junio C Hamano

Documentation/git-commit.txt: rework the --cleanup section

2013-02-19T20:36:06Z

Signed-off-by: Brandon Casey Signed-off-by: Junio C Hamano

Documentation: the name of the system is 'Git', not 'git'

2013-02-01T21:53:33Z

Signed-off-by: Thomas Ackermann Signed-off-by: Junio C Hamano

commit: make default of "cleanup" option configurable

2013-01-10T19:45:02Z

The default of the "cleanup" option in "git commit" is not configurable. Users who don't want to use the default have to pass this option on every commit since there's no way to configure it. This commit introduces a new config option "commit.cleanup" which can be used to change the default of the "cleanup" option in "git commit". Signed-off-by: Ralf Thielow Signed-off-by: Junio C Hamano

Merge branch 'tj/maint-doc-commit-sign' into maint

2012-12-27T23:25:03Z

* branch 'tj/maint-doc-commit-sign': Add -S, --gpg-sign option to manpage of "git commit"

Merge branch 'mm/maint-doc-commit-edit' into maint

2012-11-20T18:14:55Z

* mm/maint-doc-commit-edit: Document 'git commit --no-edit' explicitly