From: Junio C Hamano Date: Thu, 29 Mar 2012 21:08:09 GMT Subject: Re: git add -p and unresolved conflicts Message-ID: <7vfwcrqfnq.fsf@alter.siamese.dyndns.org> In-Reply-To: Matthieu Moy writes: > The "'git reset $path' before 'add -p'" workaround is not really handy > there: it requires typing the path,... That is exactly why "add -i" was written without first giving "add -p" shorthand, which spoiled you and at the same time robbed you the other parts of "add -i".