git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Bill Lear <rael@zopyra.com>
To: git@vger.kernel.org
Subject: 'git checkout -f' versus 'git reset --hard'
Date: Thu, 5 Apr 2007 08:36:09 -0500	[thread overview]
Message-ID: <17940.64329.10165.993967@lisa.zopyra.com> (raw)

After a failed merge, I want to undo things.  I typically use git
reset --hard, and it works like a charm.  Others have tried to use git
checkout -f, but I have cautioned that git reset --hard is really the
way to do it.  Is there a difference here, or are they equivalent?


Bill

             reply	other threads:[~2007-04-05 13:36 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-04-05 13:36 Bill Lear [this message]
2007-04-05 13:43 ` 'git checkout -f' versus 'git reset --hard' Jeff King
2007-04-05 15:29   ` Shawn O. Pearce
2007-04-05 15:43 ` Linus Torvalds

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=17940.64329.10165.993967@lisa.zopyra.com \
    --to=rael@zopyra.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).