![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 31 Dec 2007 17:23:55 +0000 (09:23 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 31 Dec 2007 17:23:55 +0000 (09:23 -0800) |
* 'maint' of git://linux-nfs.org/~bfields/git:
Documentation/user-manual.txt: fix typo
Documentation: fix remote.<name>.skipDefaultUpdate description
Documentation/user-manual.txt: fix typo
Documentation: fix remote.<name>.skipDefaultUpdate description
| 1 | 2 | |||
|---|---|---|---|---|
| Documentation/config.txt | patch | | diff1 | | diff2 | | blob | history |
| Documentation/user-manual.txt | patch | | diff1 | | diff2 | | blob | history |
diff --cc Documentation/config.txt
Simple merge
diff --cc Documentation/user-manual.txt
Simple merge