git/Documentation, branch v2.6.2Mirror of https://git.kernel.org/pub/scm/git/git.git/
https://git.shady.money/git/atom?h=v2.6.22015-10-16T21:40:05ZGit 2.6.22015-10-16T21:40:05ZJunio C Hamanogitster@pobox.com2015-10-16T21:40:04Zurn:sha1:3c3d3f629a6176b401ebec455c5dd59ed1b5f910
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'tk/doc-interpret-trailers-grammo' into maint2015-10-16T21:32:56ZJunio C Hamanogitster@pobox.com2015-10-16T21:32:56Zurn:sha1:0dd9e571e837d0f3567af7cb83f92034b4a18ee3
* tk/doc-interpret-trailers-grammo:
Documentation/interpret-trailers: Grammar fix
Merge branch 'jk/asciidoctor-section-heading-markup-fix' into maint2015-10-16T21:32:53ZJunio C Hamanogitster@pobox.com2015-10-16T21:32:53Zurn:sha1:aa8f64dead9d1ea5965fe1248709f1879f0da79c
* jk/asciidoctor-section-heading-markup-fix:
Documentation: fix section header mark-up
Merge branch 'nd/ls-remote-does-not-have-u-option' into maint2015-10-16T21:32:52ZJunio C Hamanogitster@pobox.com2015-10-16T21:32:52Zurn:sha1:22f4b15e884ad7e47ce03ad809d6f5acd055c2af
* nd/ls-remote-does-not-have-u-option:
ls-remote.txt: delete unsupported option
Merge branch 'dt/log-follow-config' into maint2015-10-16T21:32:42ZJunio C Hamanogitster@pobox.com2015-10-16T21:32:42Zurn:sha1:d5fea2418e122c6e1d5dddd57fc8d5dd95adea4e
Description of the "log.follow" configuration variable in "git log"
documentation is now also copied to "git config" documentation.
* dt/log-follow-config:
log: Update log.follow doc and add to config.txt
Merge branch 'jk/notes-dwim-doc' into maint2015-10-16T21:32:40ZJunio C Hamanogitster@pobox.com2015-10-16T21:32:40Zurn:sha1:f4892a3c2883bd517edf370c747afde29a0c2b3c
The way how --ref/--notes to specify the notes tree reference are
DWIMmed was not clearly documented.
* jk/notes-dwim-doc:
notes: correct documentation of DWIMery for notes references
Merge branch 'mm/keyid-docs' into maint2015-10-16T21:32:33ZJunio C Hamanogitster@pobox.com2015-10-16T21:32:33Zurn:sha1:be4d6f4c7f94541fac1a06e4c04acc2d60de1f8c
Very small number of options take a parameter that is optional
(which is not a great UI element as they can only appear at the end
of the command line). Add notice to documentation of each and
every one of them.
* mm/keyid-docs:
Documentation: explain optional arguments better
Documentation/grep: fix documentation of -O
Documentation: use 'keyid' consistently, not 'key-id'
Documentation/interpret-trailers: Grammar fix2015-10-07T17:53:34ZTobias Klausertklauser@distanz.ch2015-10-07T16:46:22Zurn:sha1:a43eb67e653ccaa9a00ff52adb706201d7b1af13
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
log: Update log.follow doc and add to config.txt2015-10-07T17:37:48ZEric N. Vander Weeleericvw@gmail.com2015-10-07T01:14:33Zurn:sha1:fd8d07efdaf0ed5570f975c58b2ceb6500e06dd7
Documentation/config.txt does not include the documentation for
log.follow that is in Documentation/git-log.txt. This commit adds the
log.follow documentation to config.txt and also updates the wording to
be consistent with the format that is followed by other boolean
configuration variables.
Signed-off-by: Eric N. Vander Weele <ericvw@gmail.com>
Acked-by: David Turner <dturner@twopensource.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Git 2.6.12015-09-29T02:19:34ZJunio C Hamanogitster@pobox.com2015-09-29T02:19:27Zurn:sha1:22f698cb188243b313e024d618283e0293e37140
Signed-off-by: Junio C Hamano <gitster@pobox.com>