git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Nguyen Thai Ngoc Duy" <pclouds@gmail.com>
To: "Junio C Hamano" <junkio@cox.net>
Cc: git@vger.kernel.org
Subject: Re: Restore a single file in the index back to HEAD
Date: Wed, 1 Nov 2006 16:09:19 +0700	[thread overview]
Message-ID: <fcaeb9bf0611010109t6281a120qeed21e0d3b29ad0c@mail.gmail.com> (raw)
In-Reply-To: <7vvelz7eg2.fsf@assigned-by-dhcp.cox.net>

On 11/1/06, Junio C Hamano <junkio@cox.net> wrote:
> Junio C Hamano <junkio@cox.net> writes:
>
> >> I would prefer "git update-index --reset frotz" or "git checkout
> >> --index HEAD frotz". git ls-tree|git update-index is too cryptic for
> >> me and too long for my fingers.
> >
> > Then perhaps you can use "git checkout HEAD frotz", which is the
> > simplest?
>
> Sorry, Oops.
>
> One should never respond to a message in an ancient thread
> unless one has enough time to revisit previous messages and
> refresh one's memory.
>
> The original topic was about updating the index entry without
> touching working tree, so "co HEAD path" would not do what was
> wanted.
>
> I think at the UI level, the most appropriate place would be
> "git reset".  Checkout is a Porcelainish that is primarily about
> working tree and it updates the index as a side effect (from the
> UI point of view); you can update the working tree without
> modifying index or you can update both index and the working
> tree, but updating only index and not working tree does not
> belong there.

Then perhaps git-reset should do "co HEAD path" too if --index is not specified?
To sum up:
 - git reset HEAD path -> git checkout HEAD path
 - git reset --index HEAD path -> git-ls-files HEAD path|git
update-index --index-info
 - git reset HEAD (without path) -> the current behaviour

Because  <commit-ish>  may be missing, there is some ambiguation here.
-- 

  reply	other threads:[~2006-11-01  9:09 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-10-26 15:41 Restore a single file in the index back to HEAD Andy Parkins
2006-10-26 15:42 ` 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 [this message]
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=fcaeb9bf0611010109t6281a120qeed21e0d3b29ad0c@mail.gmail.com \
    --to=pclouds@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=junkio@cox.net \
    /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).