From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 24 Aug 2012 19:34:19 +0000 (-0700)
Subject: Merge branch 'maint-1.7.11' into maint
X-Git-Tag: v1.7.12.1~29
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/871e293c9acbeaacce59dcd98fab6028f552f5be?ds=sidebyside

Merge branch 'maint-1.7.11' into maint

* 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
---

871e293c9acbeaacce59dcd98fab6028f552f5be