diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-11-08 21:33:55 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-11-08 21:33:55 -0800 |
commit | bc9c0248a5cf184756ba562d6c452cace8863517 (patch) | |
tree | fac1220b800f9656c81ccc4b105a6f7626e850ce /strbuf.c | |
parent | 5fe9cd02c2639dbe4430fab6bc220d561b28aa93 (diff) | |
parent | 7c181d627c136cbc67ef0f722e74e34017e662f0 (diff) | |
download | git-bc9c0248a5cf184756ba562d6c452cace8863517.tar.gz git-bc9c0248a5cf184756ba562d6c452cace8863517.tar.xz |
Merge branch 'maint'
* maint:
GIT 1.6.0.4
Update RPM spec for the new location of git-cvsserver.
push: fix local refs update if already up-to-date
do not force write of packed refs
Conflicts:
builtin-revert.c
Diffstat (limited to 'strbuf.c')
0 files changed, 0 insertions, 0 deletions