Re: Unstaging during a merge conflict

2012-10-03 Thread Jeff King
On Mon, Oct 01, 2012 at 08:13:21PM -0500, Matt McClellan wrote: We had an issue at our organization where changes were reverted when a user was merging his local repo with the remote repo changes. The merge conflicted and he unstaged all the changes that were not a conflict, he then resolved

Re: Unstaging during a merge conflict

2012-10-02 Thread Junio C Hamano
Matt McClellan mcclellan...@gmail.com writes: I've done this using git add --interactive then reverting a files changes, though the actual crime was done using egit staging tool. It seems the command line won't let you unstage changes but gui tools and interactive tools seem to allow it. I