From: "George Spelvin" <linux@horizon.com>
To: git@vger.kernel.org
Cc: linux@horizon.com
Subject: Why not git reset --hard <path>?
Date: 28 Sep 2015 16:34:49 -0400 [thread overview]
Message-ID: <20150928203449.29024.qmail@ns.horizon.com> (raw)
I was applying an old forgotten stash to see if there were any edits in
it I wanted to preserve, and my old changes to one file made no sense
any more. I wanted to drop then all and keep the version in HEAD.
I'd been using git reset <path> after resolving conflicts, to leave
the changes in the same un-staged state they were before the stash,
so I tried using "git reset --hard crypto/842.c" to throw away
my local changes.
And I got
fatal: Cannot do hard reset with paths.
So I did "git reset <path>" followed by "git checkout <path>", which
achieved what I wanted.
But what I don't understand is why git reset couldn't do it for me in one
step.
I understand that "git reset --soft" makes no sense with a path, but
why not --hard?
next reply other threads:[~2015-09-28 20:34 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-28 20:34 George Spelvin [this message]
2015-09-28 20:42 ` Why not git reset --hard <path>? Junio C Hamano
2015-09-28 20:53 ` Jacob Keller
2015-09-28 21:19 ` Junio C Hamano
2015-09-28 21:36 ` Theodore Ts'o
2015-09-29 7:06 ` Jacob Keller
2015-09-29 16:15 ` George Spelvin
2015-09-29 19:40 ` Philip Oakley
2015-09-28 22:36 ` George Spelvin
2015-09-28 22:58 ` Junio C Hamano
2015-09-28 23:52 ` George Spelvin
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=20150928203449.29024.qmail@ns.horizon.com \
--to=linux@horizon.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).