git/Documentation, branch v2.4.4Mirror of https://git.kernel.org/pub/scm/git/git.git/
https://git.shady.money/git/atom?h=v2.4.42015-06-16T21:38:01ZGit 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"
Merge branch 'mc/commit-doc-grammofix' into maint2015-06-16T21:33:49ZJunio C Hamanogitster@pobox.com2015-06-16T21:33:49Zurn:sha1:afd647c55f19b34c1c605f099720dcec49c4e24a
Doc grammar fix.
* mc/commit-doc-grammofix:
Documentation/git-commit: grammofix
Merge branch 'jk/http-backend-deadlock' into maint2015-06-16T21:33:45ZJunio C Hamanogitster@pobox.com2015-06-16T21:33:45Zurn:sha1:b76b4cd4f1d822686374c5fdeb68ab0aac28bff1
Communication between the HTTP server and http_backend process can
lead to a dead-lock when relaying a large ref negotiation request.
Diagnose the situation better, and mitigate it by reading such a
request first into core (to a reasonable limit).
* jk/http-backend-deadlock:
http-backend: spool ref negotiation requests to buffer
t5551: factor out tag creation
http-backend: fix die recursion with custom handler
Merge branch 'mm/log-format-raw-doc' into maint2015-06-16T21:33:43ZJunio C Hamanogitster@pobox.com2015-06-16T21:33:42Zurn:sha1:4be33f7222990c1c761cd1c497c0db88b3d376cc
Clarify that "log --raw" and "log --format=raw" are unrelated
concepts.
* mm/log-format-raw-doc:
Documentation/log: clarify sha1 non-abbreviation in log --raw
Documentation/log: clarify what --raw means
Git 2.4.32015-06-05T19:22:33ZJunio C Hamanogitster@pobox.com2015-06-05T19:15:57Zurn:sha1:69f9a6e54a46c4a75dff680047a465d04cca20ca
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'ps/doc-packfile-vs-pack-file' into maint2015-06-05T19:00:27ZJunio C Hamanogitster@pobox.com2015-06-05T19:00:27Zurn:sha1:e41f8d98e37643909e22317f2ffdd940b953af55
Doc consistency updates.
* ps/doc-packfile-vs-pack-file:
doc: fix inconsistent spelling of "packfile"
pack-protocol.txt: fix insconsistent spelling of "packfile"
git-unpack-objects.txt: fix inconsistent spelling of "packfile"
git-verify-pack.txt: fix inconsistent spelling of "packfile"
Merge branch 'fg/document-commit-message-stripping' into maint2015-06-05T19:00:26ZJunio C Hamanogitster@pobox.com2015-06-05T19:00:26Zurn:sha1:48feda5873deab617a368df0af4bc10a0731124c
* fg/document-commit-message-stripping:
Documentation: clarify how "git commit" cleans up the edited log message
Merge branch 'pt/pull-ff-vs-merge-ff' into maint2015-06-05T19:00:23ZJunio C Hamanogitster@pobox.com2015-06-05T19:00:23Zurn:sha1:7e46f27fa627c0f9f6f547bef53e5aa2de52dec5
The pull.ff configuration was supposed to override the merge.ff
configuration, but it didn't.
* pt/pull-ff-vs-merge-ff:
pull: parse pull.ff as a bool or string
pull: make pull.ff=true override merge.ff