![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Sun, 11 Mar 2007 05:47:01 +0000 (21:47 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sun, 11 Mar 2007 05:47:01 +0000 (21:47 -0800) | ||
| commit | 8bb2b516d56722776255faaccc0b1d63e444a93e | |
| tree | 37d7bfcf32e63e27905db808b23bd25b8d03286a | tree | snapshot |
| parent | c4431d380c20b4c05c373980c600798fc02e79b0 | commit | diff |
| parent | 8ce9d83b78fa95addf61cb911fa052ec4f37f77e | commit | diff |
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
* '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