From: Junio C Hamano <gitster@pobox.com>
To: "Tim Visher" <tim.visher@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Is it possible to roll back unstaged changes while leaving the staged ones for the next commit?
Date: Wed, 17 Dec 2008 12:30:41 -0800 [thread overview]
Message-ID: <7vy6yelf2m.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <c115fd3c0812171157m3d180534gb5630fbcf39b2bbd@mail.gmail.com> (Tim Visher's message of "Wed, 17 Dec 2008 14:57:08 -0500")
"Tim Visher" <tim.visher@gmail.com> writes:
> My question is this: is it possible to revert the changes that I
> haven't staged so that the file looks as if everything inside of it
> has been staged because none of the stuff I didn't stage is there
> anymore.
The last part of the sentence after "because" does not parse for me at
all, but I think you are after one of the following:
(1) if you want to get rid of garbage changes in your work tree, you
would want "git checkout $that_path";
(2) if you want to temporarily stash away further changes in your work
tree, because you would want to first test what is staged, commit it,
and then later continue to refine the changes stashed away thusly,
you would want "git stash --keep-index".
next prev parent reply other threads:[~2008-12-17 20:32 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-17 19:57 Is it possible to roll back unstaged changes while leaving the staged ones for the next commit? Tim Visher
2008-12-17 20:30 ` Junio C Hamano [this message]
2008-12-17 22:48 ` Tim Visher
2008-12-17 22:59 ` Junio C Hamano
2008-12-18 1:22 ` Tim Visher
2008-12-18 3:34 ` Nanako Shiraishi
2008-12-18 12:24 ` Tim Visher
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=7vy6yelf2m.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=tim.visher@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.
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 NNTP newsgroup(s).