Merge branch 'nd/ignore-might-be-precious'
authorJunio C Hamano <gitster@pobox.com>
Wed, 14 Dec 2011 06:55:07 +0000 (22:55 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 14 Dec 2011 06:55:07 +0000 (22:55 -0800)
commit424f30a...ae3ff26fca14df71cce31b06d1dec919
treed4c464a...476a9847fe5f70a747864a0e386020b0copy hash to clipboard (tree)
parentb2dd021...2052aff875e8dc7d12b9915c91feafe2copy hash to clipboard (diff)
parentc1d7036...6bfea586a30c6eac672e58e22e5ceaf5copy hash to clipboard (diff)
builtin/checkout.c
builtin/merge.c