From: Junio C Hamano <junkio@cox.net>
Date: Sun, 25 Feb 2007 19:08:47 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.1-rc1~134
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2c7ca1fcf19d3803a225130491e26dca86d1781d?ds=inline;hp=--cc

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.
---

2c7ca1fcf19d3803a225130491e26dca86d1781d