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 /builtin-fmt-merge-msg.c | |
| parent | Merge branch 'ds/autoconf' (diff) | |
| parent | GIT 1.6.0.4 (diff) | |
| download | tgif-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 'builtin-fmt-merge-msg.c')
0 files changed, 0 insertions, 0 deletions