git/Documentation, branch v2.3.2Mirror of https://git.kernel.org/pub/scm/git/git.git/
https://git.shady.money/git/atom?h=v2.3.22015-03-06T22:58:14ZGit 2.3.22015-03-06T22:58:14ZJunio C Hamanogitster@pobox.com2015-03-06T22:58:14Zurn:sha1:1165ae6f3d42e0eb0ddfc2d4e6dfa8bd0b88eb60
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'mm/am-c-doc' into maint2015-03-06T22:57:56ZJunio C Hamanogitster@pobox.com2015-03-06T22:57:56Zurn:sha1:d86679fa061e22e33596814630513b6a7b4d4767
The configuration variable 'mailinfo.scissors' was hard to
discover in the documentation.
* mm/am-c-doc:
Documentation/git-am.txt: mention mailinfo.scissors config variable
Documentation/config.txt: document mailinfo.scissors
Prepare for 2.3.22015-03-05T21:15:53ZJunio C Hamanogitster@pobox.com2015-03-05T21:15:53Zurn:sha1:3ebda3e9f56d49cc72488e76478d086e75be731dMerge branch 'jc/conf-var-doc' into maint2015-03-05T21:13:05ZJunio C Hamanogitster@pobox.com2015-03-05T21:13:05Zurn:sha1:c11c154f429f23f1c30f2aa067ff8bf6c1b982fe
Longstanding configuration variable naming rules has been added to
the documentation.
* jc/conf-var-doc:
CodingGuidelines: describe naming rules for configuration variables
config.txt: mark deprecated variables more prominently
config.txt: clarify that add.ignore-errors is deprecated
Merge branch 'jc/remote-set-url-doc' into maint2015-03-05T21:13:03ZJunio C Hamanogitster@pobox.com2015-03-05T21:13:03Zurn:sha1:069dea89cf2f09101e3ca9a9b3c7a216d61aac10
Clarify in the documentation that "remote.<nick>.pushURL" and
"remote.<nick>.URL" are there to name the same repository accessed
via different transports, not two separate repositories.
* jc/remote-set-url-doc:
Documentation/git-remote.txt: stress that set-url is not for triangular
Git 2.3.12015-02-25T06:14:42ZJunio C Hamanogitster@pobox.com2015-02-25T06:14:42Zurn:sha1:8004647a217c26f708bce2aa26ed94a4a0ed575d
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'jc/doc-log-rev-list-options' into maint2015-02-25T06:10:40ZJunio C Hamanogitster@pobox.com2015-02-25T06:10:39Zurn:sha1:254a3ebfe8d6061721629d9cba9b3d5f4f591ba6
"git log --help" used to show rev-list options that are irrelevant
to the "log" command.
* jc/doc-log-rev-list-options:
Documentation: what does "git log --indexed-objects" even mean?
Merge branch 'jc/diff-format-doc' into maint2015-02-25T06:10:36ZJunio C Hamanogitster@pobox.com2015-02-25T06:10:36Zurn:sha1:9f8410b941130630db288794c253e697e4515d9d
The documentation incorrectly said that C(opy) and R(ename) are the
only ones that can be followed by the score number in the output in
the --raw format.
* jc/diff-format-doc:
diff-format doc: a score can follow M for rewrite
Merge branch 'mg/push-repo-option-doc' into maint2015-02-25T06:10:19ZJunio C Hamanogitster@pobox.com2015-02-25T06:10:19Zurn:sha1:2fc85f05452087298023519cf95e04c9343ec69d
The "git push" documentation made the "--repo=<there>" option
easily misunderstood.
* mg/push-repo-option-doc:
git-push.txt: document the behavior of --repo
Documentation/git-am.txt: mention mailinfo.scissors config variable2015-02-20T23:09:23ZMatthieu MoyMatthieu.Moy@imag.fr2015-02-20T19:32:21Zurn:sha1:afb5de7f8d0dd9207a587f4ee2fa29d7ee8485ea
It was already documented, but the user had to follow the link to
git-mailinfo.txt to find it.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>