git/Documentation, branch v2.6.4Mirror of https://git.kernel.org/pub/scm/git/git.git/
https://git.shady.money/git/atom?h=v2.6.42015-12-08T22:12:45ZGit 2.6.42015-12-08T22:12:45ZJunio C Hamanogitster@pobox.com2015-12-08T22:07:30Zurn:sha1:bdfc6b364a51b19efbacbd46fcef5be41a5db50e
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'jk/rebase-no-autostash' into maint2015-12-08T22:05:01ZJunio C Hamanogitster@pobox.com2015-12-08T22:05:00Zurn:sha1:697bd2871cd04357ced89b962d39eb685dab47ca
There was no way to defeat a configured rebase.autostash variable
from the command line, as "git rebase --no-autostash" was missing.
* jk/rebase-no-autostash:
Documentation/git-rebase: fix --no-autostash formatting
rebase: support --no-autostash
Prepare for 2.6.42015-12-04T19:39:19ZJunio C Hamanogitster@pobox.com2015-12-04T19:39:19Zurn:sha1:9a8c740225bbd551d85a353a7bd33d57aafaca06
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'dk/check-ignore-docs' into maint2015-12-01T22:21:32ZJeff Kingpeff@peff.net2015-12-01T22:21:31Zurn:sha1:35f263545ce853cd3e250a67cdb3c77534343239
Documentation clarification for "check-ignore" without "--verbose".
* dk/check-ignore-docs:
check-ignore: correct documentation about output
Merge branch 'mg/doc-word-diff-example' into maint2015-12-01T22:21:11ZJeff Kingpeff@peff.net2015-12-01T22:21:11Zurn:sha1:2cc36407df4eb919c4ad3da0561d1bbdb9e0c0c4
* mg/doc-word-diff-example:
Documentation/diff: give --word-diff-regex=. example
Merge branch 'ar/doc-env-variable-format' into maint2015-12-01T22:19:33ZJeff Kingpeff@peff.net2015-12-01T22:19:33Zurn:sha1:2945adcc2db603f9d810a823feff9b75a0452d04
Minor documentation fixup.
* ar/doc-env-variable-format:
Documentation: make environment variable formatting more consistent
Documentation/diff: give --word-diff-regex=. example2015-11-24T23:38:46ZMichael J Grubergit@drmicha.warpmail.net2015-11-20T13:36:14Zurn:sha1:2c15c006511e03e775fa5f2e44b37ae9313833b0
It's just so useful.
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Jeff King <peff@peff.net>
check-ignore: correct documentation about output2015-11-24T22:13:36ZDennis Kaarsemakerdennis@kaarsemaker.net2015-11-20T20:30:48Zurn:sha1:219cbf091a3d2e2e0a9bb82ba7c297eb5da413a3
By default git check-ignore shows only the filenames that will be
ignored, not the pattern that causes their exclusion. Instead of moving
the partial exclude pattern precendence information to the -v option
where it belongs, link to gitignore(5) which describes this more
thoroughly.
Signed-off-by: Dennis Kaarsemaker <dennis@kaarsemaker.net>
Signed-off-by: Jeff King <peff@peff.net>
Documentation/git-update-index: add missing opts to synopsys2015-11-24T20:44:40ZChristian Couderchristian.couder@gmail.com2015-11-24T11:55:07Zurn:sha1:5cb2e162d21fa45a63f186b31970e2e9c9b10ba9
Untracked cache related options should appear in the synopsis.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Jeff King <peff@peff.net>
Documentation: make environment variable formatting more consistent2015-11-11T21:46:34ZАндрей Рыбакrybak.a.v@gmail.com2015-11-11T15:47:25Zurn:sha1:6dedd8001b3b6b229f6620429918152bd263fb49
Documentation/git.txt is not consistent in the way it
stylizes mentions of Environment Variables. Most of them are
enclosed in single quotes, some are enclosed in backticks,
some are not enclosed.
Signed-off-by: Andrey Rybak <rybak.a.v@gmail.com>
Signed-off-by: Jeff King <peff@peff.net>