summaryrefslogtreecommitdiff
path: root/rerere.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-01-05 14:50:33 -0800
committerJunio C Hamano <gitster@pobox.com>2011-01-05 14:50:33 -0800
commit8594495cd65f0a05ef2ce5a0225d663d89ccc6c3 (patch)
tree9c1a8bbb9fea0cc0ad5bec05e3f5144337b3fab2 /rerere.c
parentbf9b46c16d28c0e1f938947a98ca518f9644b0c0 (diff)
parent6e97ef31ce20ff93a4cc0e3c6ab5171fd6dda5f3 (diff)
downloadgit-8594495cd65f0a05ef2ce5a0225d663d89ccc6c3.tar.gz
Merge branch 'maint' to sync with 1.7.3.5
Diffstat (limited to 'rerere.c')
0 files changed, 0 insertions, 0 deletions