![[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) |
* 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
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
| 1 | 2 | |||
|---|---|---|---|---|
| Documentation/gitattributes.txt | patch | | diff1 | | diff2 | | blob | history |
| Documentation/gitignore.txt | patch | | diff1 | | diff2 | | blob | history |
diff --cc Documentation/gitattributes.txt
Simple merge
diff --cc Documentation/gitignore.txt
Simple merge