diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-02-25 11:08:47 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-25 11:08:47 -0800 |
| commit | 2c7ca1fcf19d3803a225130491e26dca86d1781d (patch) | |
| tree | a123f8cce38b69141bc011dad157c94d3781b779 /Makefile | |
| parent | 7bd59dee5b4b42f2ed233141e33713a7f012dd22 (diff) | |
| parent | d2dc6222d4e2f7fa5efc82175d14d60d7b804687 (diff) | |
| download | git-2c7ca1fcf19d3803a225130491e26dca86d1781d.tar.gz git-2c7ca1fcf19d3803a225130491e26dca86d1781d.tar.xz | |
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.
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions