git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Unstaging during a merge conflict

From
Junio C Hamano <gitster@pobox.com>
Date
Oct 2, 2012, 17:24 UTC
Message-ID
<7v4nmcaitf.fsf@alter.siamese.dyndns.org>
In-Reply-To
<CAHUDv6qM37nua2uB6TDOmf1a5L_TUFz=0q=v5W=9MrpEmWoShg@mail.gmail.com>
Matt McClellan <mcclellan.mj@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 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.

Previous: Matt McClellanNext: Jeff King
Message 2 of 3 in “Unstaging during a merge conflict”
  1. Matt McClellanOct 2, 2012
  2. Junio C HamanoOct 2, 2012
  3. Jeff KingOct 3, 2012

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.