git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Alex Riesen" <raa.lkml@gmail.com>
To: "Shawn Pearce" <spearce@spearce.org>
Cc: "Andreas Ericsson" <ae@op5.se>,
	"Andy Parkins" <andyparkins@gmail.com>,
	git@vger.kernel.org
Subject: Re: Restore a single file in the index back to HEAD
Date: Fri, 27 Oct 2006 11:45:56 +0200	[thread overview]
Message-ID: <81b0412b0610270245w6c29b3c3va7967991f53db298@mail.gmail.com> (raw)
In-Reply-To: <20061027081545.GF29057@spearce.org>

>> >Which leads us to the always interesting, fun and exciting:
>> >
>> >    git ls-tree -r HEAD | git update-index --index-info
>> >
>> >which will undo everything except 'git add' from the index, as
>> >ls-tree -r is listing everything in the last commit.
>> >
>>
>> ... and also shows The Power of the Pipe, which Daniel@google was
>> missing in recent versions of git. ;-)
>>
>> Btw, this is most definitely not a documented thing and requires a bit
>> of core git knowledge, so perhaps the "shell-scripts were good for
>> hackers to learn what to pipe where" really *is* a very important point.
>
> Agreed.

Still, it is very impressive, it is supported (and will be supported, I assume),
and as such - worth mentioning at least in these examples everyone keeps
dreaming about. Until that happened, why not mention that the output
of "git ls-tree" is compatible with --index-info of "update-index"?

diff --git a/Documentation/git-ls-tree.txt b/Documentation/git-ls-tree.txt
index f283bac..0ab9913 100644
--- a/Documentation/git-ls-tree.txt
+++ b/Documentation/git-ls-tree.txt
@@ -64,6 +64,8 @@ Output Format

 When the `-z` option is not used, TAB, LF, and backslash characters
 in pathnames are represented as `\t`, `\n`, and `\\`, respectively.
+This output format is compatible with what "--index-info --stdin" of
+git-update-index expects.



  reply	other threads:[~2006-10-27  9:46 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 [this message]
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=81b0412b0610270245w6c29b3c3va7967991f53db298@mail.gmail.com \
    --to=raa.lkml@gmail.com \
    --cc=ae@op5.se \
    --cc=andyparkins@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=spearce@spearce.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).