Merge branch 'nd/maint-ignore-exclude'
authorJunio C Hamano <gitster@pobox.com>
Mon, 5 Dec 2011 23:25:12 +0000 (15:25 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 5 Dec 2011 23:25:12 +0000 (15:25 -0800)
commit9ef5697...1f967c1559b498d8f77a2c42a14be2ed
treeafd2b29...e852150fd4f74d57e257ab47729ca86ccopy hash to clipboard (tree)
parentce8781e...ab66fb90fb7baf8d953a4582a06571a7copy hash to clipboard (diff)
parentfc001b5...6c42e5fb776340136a2fb247e391a61bcopy hash to clipboard (diff)
builtin/checkout.c
builtin/merge.c