git/Documentation, branch v2.3.6Mirror of https://git.kernel.org/pub/scm/git/git.git/
https://git.shady.money/git/atom?h=v2.3.62015-04-21T19:17:09ZGit 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
CodingGuidelines: update 'rough' rule count2015-04-14T16:50:31ZJulian Gindijuliangindi@gmail.com2015-04-13T12:54:14Zurn:sha1:6c3b2afe6f64d33c176a8d369793392d7659fd6f
Changed inaccurate count of "rough rules" from three to the more
generic 'a few'.
Signed-off-by: Julian Gindi <juliangindi@gmail.com>
Reviewed-by: Eric Sunshine <sunshine@sunshineco.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
howto: document more tools for recovery corruption2015-04-02T05:44:03ZJeff Kingpeff@peff.net2015-04-01T21:08:56Zurn:sha1:2b8bd44aaba66898a92e6dac5c285285d1b94ac2
Long ago, I documented a corruption recovery I did and gave
some C code that I used to help find a flipped bit. I had
to fix a similar case recently, and I ended up writing a few
more tools. I hope nobody ever has to use these, but it
does not hurt to share them, just in case.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
fast-import doc: remove suggested 16-parent limit2015-04-01T00:02:29ZJonathan Niederjrnieder@gmail.com2015-03-31T23:18:07Zurn:sha1:9585cb8d964a1f17895d58b280b5adf62265be53
Merges with an absurd number of parents are still a bad idea because
they do not render well in tools like gitk, but if they are present
in the repository being imported into git then there's no need to
avoid reproducing them faithfully.
In olden times, before v1.6.0-rc0~194 (2008-06-27), git commit-tree
and higher-level tools built on top of it were limited to writing 16
parents for a commit. Nowadays normal git operations are happy to
write more parents when asked, so the motivation for this note in the
fast-import documentation is gone and we can remove it.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Git 2.3.52015-03-31T21:57:10ZJunio C Hamanogitster@pobox.com2015-03-31T21:57:10Zurn:sha1:52735a689270bb1de94eb3de198594b36caed9bb
Signed-off-by: Junio C Hamano <gitster@pobox.com>