From: Junio C Hamano Date: Fri, 27 Nov 2009 08:56:05 +0000 (-0800) Subject: Merge branch 'maint' X-Git-Tag: v1.6.6-rc1~25 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=41d5b7e362c33dc54cbc814e50403a2084204f9f;p=git.git Merge branch 'maint' * maint: builtin-apply.c: pay attention to -p when determining the name --- 41d5b7e362c33dc54cbc814e50403a2084204f9f