| commit | bc9c0248a5cf184756ba562d6c452cace8863517 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 9 Nov 2008 05:33:55 +0000 (8 21:33 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 9 Nov 2008 05:33:55 +0000 (8 21:33 -0800) | ||
| tree | fac1220b800f9656c81ccc4b105a6f7626e850ce | treesnapshot (tar.gz zip) |
| parent | 5fe9cd02c2639dbe4430fab6bc220d561b28aa93 | commitdiff |
| parent | 7c181d627c136cbc67ef0f722e74e34017e662f0 | commitdiff |
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
* 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
| builtin-send-pack.c | diff1 | diff2 | blobhistory |
| refs.c | diff1 | diff2 | blobhistory |