projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b2dd021 c1d7036)
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)
* nd/ignore-might-be-precious:
  checkout,merge: disallow overwriting ignored files with --no-overwrite-ignore

1  2 
builtin/checkout.c patch | diff1 | diff2 | blob | history
builtin/merge.c patch | diff1 | diff2 | blob | history

diff --cc builtin/checkout.c
Simple merge
diff --cc builtin/merge.c
Simple merge
Git—the stupid content tracker