diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-08-24 12:34:19 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-08-24 12:34:19 -0700 |
commit | 871e293c9acbeaacce59dcd98fab6028f552f5be (patch) | |
tree | c363ffb2dcced8d6e8057e31c5d7378508205c50 /git-gui/lib/merge.tcl | |
parent | Merge branch 'maint-1.7.11' into maint (diff) | |
parent | Prepare for 1.7.11.6 (diff) | |
download | tgif-871e293c9acbeaacce59dcd98fab6028f552f5be.tar.xz |
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 'git-gui/lib/merge.tcl')
0 files changed, 0 insertions, 0 deletions