projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8ee002f 24362a5)
Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Thu, 27 Mar 2008 20:35:18 +0000 (13:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 27 Mar 2008 20:35:18 +0000 (13:35 -0700)
commit319a36a5c2da8dd07993caac43b7820bff3b0d37
treedcf79cf682e76fca476ff7bea7024efda338807etree | snapshot
parent8ee002fd3d875027f70729c0674282dc46fc5654commit | diff
parent24362a5d3ffc5ef10ccbcd80b258a418a1c792b5commit | 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
Documentation/gitattributes.txt diff1 | diff2 | blob | history
Documentation/gitignore.txt diff1 | diff2 | blob | history
Git—the stupid content tracker