projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7bd59de d2dc622)
Merge branch 'maint'
authorJunio C Hamano <junkio@cox.net>
Sun, 25 Feb 2007 19:08:47 +0000 (11:08 -0800)
committerJunio C Hamano <junkio@cox.net>
Sun, 25 Feb 2007 19:08:47 +0000 (11:08 -0800)
commit2c7ca1fcf19d3803a225130491e26dca86d1781d
treea123f8cce38b69141bc011dad157c94d3781b779tree | snapshot
parent7bd59dee5b4b42f2ed233141e33713a7f012dd22commit | diff
parentd2dc6222d4e2f7fa5efc82175d14d60d7b804687commit | diff
Merge branch 'maint'

* maint:
  Add Release Notes to prepare for 1.5.0.2
  Allow arbitrary number of arguments to git-pack-objects
  rerere: do not deal with symlinks.
  rerere: do not skip two conflicted paths next to each other.
  Don't modify CREDITS-FILE if it hasn't changed.
builtin-pack-objects.c diff1 | diff2 | blob | history
builtin-rerere.c diff1 | diff2 | blob | history
Git—the stupid content tracker