Git development
 help / color / mirror / Atom feed
From: Matthieu Moy <Matthieu.Moy@imag.fr>
To: Joe Fiorini <joe@faithfulgeek.org>
Cc: Jeff King <peff@peff.net>, git@vger.kernel.org
Subject: Re: Undo git-rm without commit?
Date: Wed, 26 Mar 2008 10:48:03 +0100	[thread overview]
Message-ID: <vpqve3995po.fsf@bauges.imag.fr> (raw)
In-Reply-To: <0535D2B4-0C4A-40D0-879A-7E0C5B3B48E4@faithfulgeek.org> (Joe Fiorini's message of "Wed\, 26 Mar 2008 02\:38\:42 -0400")

Joe Fiorini <joe@faithfulgeek.org> writes:

> Yeah, it warned me, I wasn't being careful enough.  I guess I didn't
> think it would remove from the working tree, just the repository.  My
> err for not reading the docs until _after_ the mistake.

Reading the error message would have done it also :-\.

>>  error: 'file' has changes staged in the index
>>  (use --cached to keep the file, or -f to force removal)
         ^^^^^^^^^^^^^^^^^^^^^^^^^

Good luck with lost+found, still !

-- 
Matthieu

      parent reply	other threads:[~2008-03-26  9:49 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-03-26  6:17 Undo git-rm without commit? Joe Fiorini
2008-03-26  6:24 ` Mike Hommey
2008-03-26  6:26 ` Jeff King
2008-03-26  6:38   ` Joe Fiorini
2008-03-26  6:39     ` Jeff King
2008-03-26  9:48     ` Matthieu Moy [this message]

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

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

  git send-email \
    --in-reply-to=vpqve3995po.fsf@bauges.imag.fr \
    --to=matthieu.moy@imag.fr \
    --cc=git@vger.kernel.org \
    --cc=joe@faithfulgeek.org \
    --cc=peff@peff.net \
    /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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox