git/Documentation, branch v2.3.8Mirror of https://git.kernel.org/pub/scm/git/git.git/
https://git.shady.money/git/atom?h=v2.3.82015-05-11T21:36:31ZGit 2.3.82015-05-11T21:36:31ZJunio C Hamanogitster@pobox.com2015-05-11T21:36:31Zurn:sha1:9a3d637541a5b6fcd84b6f5fa057e597d1696460
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'mm/usage-log-l-can-take-regex' into maint-2.32015-05-11T21:34:01ZJunio C Hamanogitster@pobox.com2015-05-11T21:34:01Zurn:sha1:811ce1b47c5486fa3348617d062e2eb4593962a1
Documentation fix.
* mm/usage-log-l-can-take-regex:
log -L: improve error message on malformed argument
Documentation: change -L:<regex> to -L:<funcname>
Git 2.3.72015-04-27T19:25:36ZJunio C Hamanogitster@pobox.com2015-04-27T19:25:36Zurn:sha1:16018ae5fb368151f3eff13730cf089b63f41962
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Git 2.3.62015-04-21T19:17:09ZJunio C Hamanogitster@pobox.com2015-04-21T19:17:09Zurn:sha1:ba63bfaa59ee41bd679286a594cc643b5a53c48d
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'jz/gitweb-conf-doc-fix' into maint2015-04-21T19:12:22ZJunio C Hamanogitster@pobox.com2015-04-21T19:12:22Zurn:sha1:1c30f8efa4ce4e9f5a3a41bf0236fe5baf2b6063
Documentation update.
* jz/gitweb-conf-doc-fix:
gitweb.conf.txt: say "build-time", not "built-time"
Merge branch 'jk/cherry-pick-docfix' into maint2015-04-21T19:12:21ZJunio C Hamanogitster@pobox.com2015-04-21T19:12:21Zurn:sha1:c809f4258fb066078b401cfead578a7bb855a2cb
* jk/cherry-pick-docfix:
cherry-pick: fix docs describing handling of empty commits
Merge branch 'jg/cguide-we-cannot-count' into maint2015-04-21T19:12:19ZJunio C Hamanogitster@pobox.com2015-04-21T19:12:19Zurn:sha1:e8281f01642fe17d6f44b3b18ed333b322770e81
* jg/cguide-we-cannot-count:
CodingGuidelines: update 'rough' rule count
Merge branch 'jk/pack-corruption-post-mortem' into maint2015-04-21T19:12:18ZJunio C Hamanogitster@pobox.com2015-04-21T19:12:18Zurn:sha1:2e0aabe602c08938520925e204028ae1f716ce98
Documentation update.
* jk/pack-corruption-post-mortem:
howto: document more tools for recovery corruption
Merge branch 'jn/doc-fast-import-no-16-octopus-limit' into maint2015-04-21T19:12:17ZJunio C Hamanogitster@pobox.com2015-04-21T19:12:17Zurn:sha1:e9ab76da8f9ec1b4312de87bc68a1c4bcbf10329
Documentation update.
* jn/doc-fast-import-no-16-octopus-limit:
fast-import doc: remove suggested 16-parent limit
Documentation: change -L:<regex> to -L:<funcname>2015-04-20T18:05:50ZMatthieu MoyMatthieu.Moy@imag.fr2015-04-20T12:09:06Zurn:sha1:d349e0ee60e1bad1cf49245e402ca086ddb5ff80
The old wording was somehow implying that <start> and <end> were not
regular expressions. Also, the common case is to use a plain function
name here so <funcname> makes sense (the fact that it is a regular
expression is documented in line-range-format.txt).
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>