git-add: no need for -f when resolving a conflict in already tracked path
authorJeff King <peff@peff.net>
Sat, 30 May 2009 21:54:18 +0000 (17:54 -0400)
committerJunio C Hamano <gitster@pobox.com>
Sun, 31 May 2009 22:59:16 +0000 (15:59 -0700)
commit6e4f981...fb88c8a9d3d6128314f4dd4f54ffb8a8
tree46b7c19...0fdcc6c9634c0aea2b95cf6219c95487copy hash to clipboard (tree)
parent13bd213...0888de1fab7d745fc447bb43694a20c5copy hash to clipboard (diff)
dir.c
t/t3700-add.sh