From: Andy Parkins <andyparkins@gmail.com>
To: git@vger.kernel.org
Subject: Restore a single file in the index back to HEAD
Date: Thu, 26 Oct 2006 16:41:09 +0100 [thread overview]
Message-ID: <200610261641.11239.andyparkins@gmail.com> (raw)
Hello,
I have something like this:
# On branch refs/heads/newmaster
# Updated but not checked in:
# (will commit)
#
# modified: oops/file1
# modified: good/file2
# modified: good/file3
# modified: good/file4
i.e. the index has been updated to hold oops/file1
If I then didn't want to commit oops/file1, how do I restore the HEAD
oops/file1 back to the index without doing a full reset?
What I'm wishing for is a per file reset...
git-reset --mixed HEAD oops/file1
(I realise that the above is crazy, but I hope it's explaining what I want).
When I do a git checkout -f oops/file1; I get
"git checkout: updating paths is incompatible with switching branches/forcing
Did you intend to checkout 'oops/file1' which can not be resolved as commit?"
Andy
--
Dr Andy Parkins, M Eng (hons), MIEE
next reply other threads:[~2006-10-26 15:41 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-10-26 15:41 Andy Parkins [this message]
2006-10-26 15:42 ` Restore a single file in the index back to HEAD Alex Riesen
2006-10-27 7:27 ` Andy Parkins
2006-10-27 7:38 ` Shawn Pearce
2006-10-27 8:01 ` Andy Parkins
2006-10-27 8:08 ` Andreas Ericsson
2006-10-27 8:15 ` Shawn Pearce
2006-10-27 9:45 ` Alex Riesen
2006-10-27 9:50 ` Andreas Ericsson
2006-10-27 10:02 ` Junio C Hamano
2006-10-27 17:45 ` Luben Tuikov
2006-11-01 7:58 ` Nguyen Thai Ngoc Duy
2006-11-01 8:07 ` Junio C Hamano
2006-11-01 8:34 ` Junio C Hamano
2006-11-01 9:09 ` Nguyen Thai Ngoc Duy
2006-11-01 11:22 ` Jakub Narebski
2006-11-01 9:38 ` Jakub Narebski
2006-11-01 8:39 ` Andy Parkins
2006-11-01 8:56 ` Junio C Hamano
2006-11-01 9:53 ` Andy Parkins
2006-11-01 18:28 ` Junio C Hamano
2006-11-01 20:29 ` Andy Parkins
2006-11-01 20:49 ` Junio C Hamano
2006-11-01 21:18 ` Andy Parkins
2006-11-01 22:08 ` Junio C Hamano
2006-11-01 23:09 ` Andy Parkins
2006-11-01 23:39 ` Junio C Hamano
2006-11-02 8:44 ` Andy Parkins
2006-11-01 22:27 ` Robin Rosenberg
2006-11-02 12:47 ` Salikh Zakirov
2006-10-27 9:03 ` [PATCH] Added description for inverting git-update-index using --index-info Andy Parkins
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=200610261641.11239.andyparkins@gmail.com \
--to=andyparkins@gmail.com \
--cc=git@vger.kernel.org \
/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).