From: Junio C Hamano Date: Sun, 11 Mar 2007 05:47:01 +0000 (-0800) Subject: Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint X-Git-Tag: v1.5.0.4~12 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8bb2b516d56722776255faaccc0b1d63e444a93e;p=git.git Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint * 'maint' of git://linux-nfs.org/~bfields/git: user-manual: install user manual stylesheet with other web documents user-manual: fix rendering of history diagrams user-manual: fix missing colon in git-show example user-manual: fix inconsistent use of pull and merge user-manual: fix inconsistent example glossary: fix overoptimistic automatic linking of defined terms --- 8bb2b516d56722776255faaccc0b1d63e444a93e