Merge branch 'nd/maint-ignore-exclude' into maint-1.7.7
authorJunio C Hamano <gitster@pobox.com>
Wed, 14 Dec 2011 05:47:08 +0000 (21:47 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 14 Dec 2011 05:47:08 +0000 (21:47 -0800)
commit3b42565...a469722d9c45b7c88e0e01a9cd8c0fd3
tree189b988...6ea410ba2a94a578b4c7261b4f52e434copy hash to clipboard (tree)
parent7857e32...6fef2fdfa3c0fc645cd3d72ff3e6572bcopy hash to clipboard (diff)
parentfc001b5...6c42e5fb776340136a2fb247e391a61bcopy hash to clipboard (diff)
builtin/checkout.c
builtin/merge.c