![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 27 Mar 2008 20:35:18 +0000 (13:35 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 27 Mar 2008 20:35:18 +0000 (13:35 -0700) | ||
| commit | 319a36a5c2da8dd07993caac43b7820bff3b0d37 | |
| tree | dcf79cf682e76fca476ff7bea7024efda338807e | tree | snapshot |
| parent | 8ee002fd3d875027f70729c0674282dc46fc5654 | commit | diff |
| parent | 24362a5d3ffc5ef10ccbcd80b258a418a1c792b5 | commit | diff |
Merge branch 'maint'
* maint:
Update draft release notes for 1.5.4.5
Documentation: clarify use of .git{ignore,attributes} versus .git/info/*
t/t3800-mktag.sh: use test_must_fail rather than '!'
Conflicts:
t/t3800-mktag.sh
* maint:
Update draft release notes for 1.5.4.5
Documentation: clarify use of .git{ignore,attributes} versus .git/info/*
t/t3800-mktag.sh: use test_must_fail rather than '!'
Conflicts:
t/t3800-mktag.sh
| Documentation/gitattributes.txt | diff1 | | diff2 | | blob | history |
| Documentation/gitignore.txt | diff1 | | diff2 | | blob | history |