Merge branch 'maint-1.7.11' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 24 Aug 2012 19:34:19 +0000 (12:34 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 24 Aug 2012 19:34:19 +0000 (12:34 -0700)
* maint-1.7.11:
Prepare for 1.7.11.6
Make the ciabot scripts completely self-configuring in the normal case.
Improved documentation for the ciabot scripts.
man: git pull -r is a short for --rebase
gitcli: describe abbreviation of long options
rev-list docs: clarify --topo-order description
Documentation/CodingGuidelines: spell out more shell guidelines
Documentation: do not mention .git/refs/* directories
tests: Introduce test_seq

Trivial merge