![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sat, 9 May 2009 16:27:43 +0000 (09:27 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 9 May 2009 16:27:43 +0000 (09:27 -0700) | ||
| commit | 6345d7a0d151afc3d2a10ada3ecacf54c3fee2d0 | |
| tree | 4d2814b43911594cf054a9c4613baf55f6e5b7a4 | tree | snapshot |
| parent | be427d758b53343d31debb520c0bc251a62013a9 | commit | diff |
| parent | ec00d6e0038e030cf73182374e21025c2776cb23 | commit | diff |
Merge branch 'maint'
* maint:
Documentation: cloning to empty directory is allowed
Clarify kind of conflict in merge-one-file helper
git config: clarify --add and --get-color
archive-tar.c: squelch a type mismatch warning
* maint:
Documentation: cloning to empty directory is allowed
Clarify kind of conflict in merge-one-file helper
git config: clarify --add and --get-color
archive-tar.c: squelch a type mismatch warning