author | Junio C Hamano <gitster@pobox.com> | |
Sun, 9 Nov 2008 05:33:55 +0000 (21:33 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sun, 9 Nov 2008 05:33:55 +0000 (21:33 -0800) |
* 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
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
1 | 2 | |||
---|---|---|---|---|
builtin-send-pack.c | patch | | diff1 | | diff2 | | blob | history |
refs.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc builtin-send-pack.c
Simple merge
diff --cc refs.c
Simple merge