From: Jonathan Nieder <jrnieder@gmail.com>
To: Ralf Ebert <ralf@ralfebert.de>
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Miles Bader" <miles@gnu.org>,
git@vger.kernel.org, "Ralf Ebert" <info@ralfebert.de>
Subject: Re: [PATCH] reset: Better warning message on git reset --mixed <paths>
Date: Sun, 15 Aug 2010 19:12:11 -0500 [thread overview]
Message-ID: <20100816001211.GD3296@burratino> (raw)
In-Reply-To: <1281906304.32195.26.camel@lucy.SSG5-Serial-WLAN>
Ralf Ebert wrote:
> git wipe [<path>] # git reset [<file>]; git checkout [<file>]
git checkout HEAD -- <pathspec>.
So:
repository ---> index ---> work tree
Limited by paths
================
r -> i: git reset <rev> -- <pathspec>
i -> w: git checkout -- <pathspec>
r -> w: git checkout <rev> -- <pathspec>
Updating head symref
====================
r -> r: git checkout HEAD^0 && git reset --soft <rev> && git checkout <rev>
r -> i: git checkout HEAD^0 && git reset --mixed <rev> && git checkout <rev>
r -> w: git checkout <rev>
Resetting branch tip
====================
r -> r: git reset --soft <rev>
r -> i: git reset --mixed <rev>
r -> w: git reset --hard <rev>
“git checkout --no-update” and “git checkout --no-update --keep-index”
do not sound very useful to me, so I am not suggesting adding them.
next prev parent reply other threads:[~2010-08-16 0:14 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-14 19:34 [PATCH] reset: Better warning message on git reset --mixed <paths> Ævar Arnfjörð Bjarmason
2010-08-14 21:05 ` Jonathan Nieder
2010-08-15 1:47 ` Junio C Hamano
2010-08-15 2:43 ` Miles Bader
2010-08-15 8:38 ` Ævar Arnfjörð Bjarmason
2010-08-15 18:36 ` Junio C Hamano
2010-08-15 19:49 ` Jonathan Nieder
2010-08-15 22:18 ` Junio C Hamano
2010-08-15 20:51 ` Ævar Arnfjörð Bjarmason
2010-08-15 22:22 ` Junio C Hamano
2010-08-16 0:59 ` Miles Bader
2010-08-16 1:13 ` Ævar Arnfjörð Bjarmason
2010-08-15 21:05 ` Ralf Ebert
2010-08-16 0:12 ` Jonathan Nieder [this message]
2010-08-15 13:02 ` David Fries
2010-08-15 8:43 ` [PATCH v2] " Ævar Arnfjörð Bjarmason
2010-08-16 3:39 ` Junio C Hamano
2010-08-16 4:23 ` Ævar Arnfjörð Bjarmason
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=20100816001211.GD3296@burratino \
--to=jrnieder@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=info@ralfebert.de \
--cc=miles@gnu.org \
--cc=ralf@ralfebert.de \
/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).