Re: Unstaging during a merge conflict

Matt McClellan [off-list ref] 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 think you could do "git reset [--mixed]" from the command line to
induce the same mistake.  It may be that it is much less likely for
people to do this from the command line because the command name is
"reset" that is spelled in red ;-) than some GUI programs without a
careful UI to mark potentially dangerous operations as such, like we
do in the CLI.