From: Junio C Hamano <gitster@pobox.com>
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: https://git.tokkee.org/?a=commitdiff_plain;h=41d5b7e362c33dc54cbc814e50403a2084204f9f;p=git.git

Merge branch 'maint'

* maint:
  builtin-apply.c: pay attention to -p<n> when determining the name
---

41d5b7e362c33dc54cbc814e50403a2084204f9f