git/Documentation, branch v2.12.2

Git 2.12.2

2017-03-24T19:59:15Z

Signed-off-by: Junio C Hamano

Merge branch 'ab/doc-no-option-notation-fix' into maint

2017-03-24T19:57:55Z

Doc fix. * ab/doc-no-option-notation-fix: doc: change erroneous --[no]-whatever into --[no-]whatever

Merge branch 'ab/push-default-doc-fix' into maint

2017-03-24T19:57:54Z

Doc fix. * ab/push-default-doc-fix: push: mention "push.default=tracking" in the documentation

Merge branch 'nd/commit-hook-doc-fix' into maint

2017-03-24T19:57:54Z

Doc fix. * nd/commit-hook-doc-fix: git-commit.txt: list post-rewrite in HOOKS section

Prepare for 2.12.2

2017-03-21T22:04:12Z

Signed-off-by: Junio C Hamano

Merge branch 'dt/gc-ignore-old-gc-logs' into maint

2017-03-21T22:03:28Z

A "gc.log" file left by a backgrounded "gc --auto" disables further automatic gc; it has been taught to run at least once a day (by default) by ignoring a stale "gc.log" file that is too old. * dt/gc-ignore-old-gc-logs: gc: ignore old gc.log files

Merge branch 'ps/docs-diffcore' into maint

2017-03-21T22:03:25Z

Doc update. * ps/docs-diffcore: docs/diffcore: unquote "Complete Rewrites" in headers docs/diffcore: fix grammar in diffcore-rename header

Git 2.12.1

2017-03-20T20:17:08Z

Signed-off-by: Junio C Hamano

push: mention "push.default=tracking" in the documentation

2017-03-20T17:59:43Z

Change the documentation for push.tracking=* to re-include a mention of what "tracking" does. The "tracking" option was renamed to "upstream" back in 53c4031 ("push.default: Rename 'tracking' to 'upstream'", 2011-02-16), this section was then subsequently rewritten in 87a70e4 ("config doc: rewrite push.default section", 2013-06-19) to remove any mention of "tracking". Maybe we should just warn or die nowadays if this option is in the config, but I had some old config of mine use this option, I'd forgotten that it was a synonym, and nothing in git's documentation mentioned that. That's bad, either we shouldn't support it at all, or we should document what it does. This patch does the latter. Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano

git-commit.txt: list post-rewrite in HOOKS section

2017-03-20T17:53:29Z

The hook was added in a86ed83cce (Merge branch 'tr/notes-display' - 2010-03-24), which updated githooks.txt but not git-commit.txt. git-commit.txt was later updated in e858af6d50 (commit: document a couple of options - 2012-06-08). Since this commit focused on command line options, this section was probably forgotten. Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano