Merge branch 'jn/merge-renormalize'
authorJunio C Hamano <gitster@pobox.com>
Fri, 3 Sep 2010 16:43:41 +0000 (09:43 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 3 Sep 2010 16:43:41 +0000 (09:43 -0700)
commit8aed4a5...38a2a4f31567e01ab2a73341e972c08a
tree349cd09...47bc932588ca38634b75a65846f82751copy hash to clipboard (tree)
parent22ffc39...0332e892ddbf16b39d9b611aff238d9bcopy hash to clipboard (diff)
parent7610fa5...e63b0acc0a66717fc2d85755634db591copy hash to clipboard (diff)
Documentation/gitattributes.txt
builtin/checkout.c
builtin/merge-recursive.c
builtin/merge.c
builtin/rerere.c
builtin/revert.c
cache.h
merge-recursive.c
merge-recursive.h
rerere.c
t/t4200-rerere.sh