summaryrefslogtreecommitdiff
path: root/builtin-fmt-merge-msg.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-11-11 15:00:05 -0800
committerJunio C Hamano <gitster@pobox.com>2007-11-11 15:00:05 -0800
commit82527cf33e59308b86cf3defe9ae0f5c2367a012 (patch)
treed780715fae0b171b98dbd7f71983eccf8ccecf7e /builtin-fmt-merge-msg.c
parent1b2486d73789aaed0671e8d5cc60f5624d8e7ce5 (diff)
parenta91ef6e75b897a255cc17b70014a39e68dd54c7a (diff)
downloadgit-82527cf33e59308b86cf3defe9ae0f5c2367a012.tar.gz
Merge branch 'maint'
* maint: fix index-pack with packs >4GB containing deltas on 32-bit machines git-hash-object should honor config variables gitweb: correct month in date display for atom feeds
Diffstat (limited to 'builtin-fmt-merge-msg.c')
0 files changed, 0 insertions, 0 deletions