Merge branch 'nd/maint-ignore-exclude' into nd/ignore-might-be-precious
authorJunio C Hamano <gitster@pobox.com>
Mon, 28 Nov 2011 18:41:43 +0000 (10:41 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 28 Nov 2011 18:41:43 +0000 (10:41 -0800)
commitf44054c...2f4199ccff14f472e4fd7904b0db8ff5
treea34aedc...fb8a8f919bb7ce86a91ed9f0b6d43848copy hash to clipboard (tree)
parent017d1e1...4545db0d162908f3538077eaa1f34fb6copy hash to clipboard (diff)
parentfc001b5...6c42e5fb776340136a2fb247e391a61bcopy hash to clipboard (diff)
builtin/checkout.c
builtin/merge.c