git/Documentation, branch v2.4.6Mirror of https://git.kernel.org/pub/scm/git/git.git/
https://git.shady.money/git/atom?h=v2.4.62015-07-15T19:31:07ZGit 2.4.62015-07-15T19:31:07ZJunio C Hamanogitster@pobox.com2015-07-15T18:45:42Zurn:sha1:bb3e7b1a5505bae590b0d85a3995a61d6dd82547
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'mm/describe-doc' into maint2015-07-15T18:41:26ZJunio C Hamanogitster@pobox.com2015-07-15T18:41:26Zurn:sha1:b7abfacf5e41e9ea4d73869d163d2a5a0fc4f475
Docfix.
* mm/describe-doc:
Documentation/describe: improve one-line summary
Merge branch 'fk/doc-format-patch-vn' into maint2015-07-15T18:41:22ZJunio C Hamanogitster@pobox.com2015-07-15T18:41:22Zurn:sha1:a15ebbc2c7181ad6574726ebf9549e99ee293c74
Docfix.
* fk/doc-format-patch-vn:
doc: format-patch: fix typo
Git 2.4.52015-06-25T18:03:05ZJunio C Hamanogitster@pobox.com2015-06-25T18:03:05Zurn:sha1:0df0541bf13723658d31b8d1376b505b710e63c6
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'sg/merge-summary-config' into maint2015-06-25T18:02:17ZJunio C Hamanogitster@pobox.com2015-06-25T18:02:16Zurn:sha1:ebf4fc90da239f1005d2c5b1a4278cfe51430151
Doc updates.
* sg/merge-summary-config:
Documentation: include 'merge.branchdesc' for merge and config as well
Merge branch 'sb/pack-protocol-mention-smart-http' into maint2015-06-25T18:02:14ZJunio C Hamanogitster@pobox.com2015-06-25T18:02:14Zurn:sha1:68538cf9545ff853518b29fcac8e6bbe00a97f56
Doc updates.
* sb/pack-protocol-mention-smart-http:
Documentation/technical/pack-protocol: mention http as possible protocol
Merge branch 'jk/color-diff-plain-is-context' into maint2015-06-25T18:02:11ZJunio C Hamanogitster@pobox.com2015-06-25T18:02:11Zurn:sha1:6998d890c7120fe2d30fa0b6f80ddfaad716f632
"color.diff.plain" was a misnomer; give it 'color.diff.context' as
a more logical synonym.
* jk/color-diff-plain-is-context:
diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXT
diff: accept color.diff.context as a synonym for "plain"
Git 2.4.42015-06-16T21:38:01ZJunio C Hamanogitster@pobox.com2015-06-16T21:38:01Zurn:sha1:f09bd215cde5e30029fe08f309d0554eb9256778
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'sb/submodule-doc-intro' into maint2015-06-16T21:33:52ZJunio C Hamanogitster@pobox.com2015-06-16T21:33:52Zurn:sha1:0d9388dc30717a5780fa84befa03bef56884805a
* sb/submodule-doc-intro:
submodule doc: reorder introductory paragraphs
Merge branch 'sb/glossary-submodule' into maint2015-06-16T21:33:51ZJunio C Hamanogitster@pobox.com2015-06-16T21:33:51Zurn:sha1:6de4c808391ffff01185c093d6c46f2861f48862
* sb/glossary-submodule:
glossary: add "remote", "submodule", "superproject"