diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-08-24 19:34:19 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-08-24 19:34:19 (GMT) |
| commit | 871e293c9acbeaacce59dcd98fab6028f552f5be (patch) | |
| tree | c363ffb2dcced8d6e8057e31c5d7378508205c50 /diff.c | |
| parent | fab4b04e4be5ccfdf93e21e7260040bd9e7faedd (diff) | |
| parent | b52183179bb0a97ea4d91d1248aca303d8e8f892 (diff) | |
| download | git-871e293c9acbeaacce59dcd98fab6028f552f5be.zip git-871e293c9acbeaacce59dcd98fab6028f552f5be.tar.gz git-871e293c9acbeaacce59dcd98fab6028f552f5be.tar.bz2 | |
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
Diffstat (limited to 'diff.c')
0 files changed, 0 insertions, 0 deletions