checkout,merge: disallow overwriting ignored files with --no-overwrite-ignore
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Sun, 27 Nov 2011 10:15:33 +0000 (17:15 +0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 28 Nov 2011 18:41:53 +0000 (10:41 -0800)
commitc1d7036...6bfea586a30c6eac672e58e22e5ceaf5
tree3e5bef9...0f7ce6b7d8fe2bb2d21066951776255ecopy hash to clipboard (tree)
parentf44054c...2f4199ccff14f472e4fd7904b0db8ff5copy hash to clipboard (diff)
builtin/checkout.c
builtin/merge.c