git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Matt McClellan <mcclellan.mj@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Unstaging during a merge conflict
Date: Tue, 02 Oct 2012 10:24:12 -0700	[thread overview]
Message-ID: <7v4nmcaitf.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <CAHUDv6qM37nua2uB6TDOmf1a5L_TUFz=0q=v5W=9MrpEmWoShg@mail.gmail.com> (Matt McClellan's message of "Mon, 1 Oct 2012 20:13:21 -0500")

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.

  reply	other threads:[~2012-10-02 17:24 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-10-02  1:13 Unstaging during a merge conflict Matt McClellan
2012-10-02 17:24 ` Junio C Hamano [this message]
2012-10-03 22:01 ` Jeff King

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=7v4nmcaitf.fsf@alter.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=mcclellan.mj@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).