All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jakub Narebski <jnareb@gmail.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] sha1_name(): accept ':directory/' to get at the cache_tree
Date: Fri, 22 Dec 2006 19:05:01 +0100	[thread overview]
Message-ID: <200612221905.02915.jnareb@gmail.com> (raw)
In-Reply-To: <Pine.LNX.4.63.0612221315370.19693@wbgn013.biozentrum.uni-wuerzburg.de>

Johannes Schindelin wrote:

> On Fri, 22 Dec 2006, Jakub Narebski wrote:
> 
>> Junio C Hamano wrote:
>> 
>>> (2) What does this do when the index is unmerged?
>> 
>> I think it should show "git ls-files --unmerged --abbrev", perhaps...
> 
> Nah. I'd rather fail out, saying that because there are unmerged entries, 
> there is no valid tree in the index.

Well, 'git diff' on unmerged IIRC does 'git diff -cc', so why not 'git show :'
do 'git ls-files --unmerged --abbrev'...
-- 
Jakub Narebski
Poland

  reply	other threads:[~2006-12-22 18:02 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-12-22  2:19 [PATCH] sha1_name(): accept ':directory/' to get at the cache_tree Johannes Schindelin
2006-12-22  4:29 ` Junio C Hamano
2006-12-22  8:28   ` Jakub Narebski
2006-12-22 12:16     ` Johannes Schindelin
2006-12-22 18:05       ` Jakub Narebski [this message]
2006-12-22 12:14   ` Johannes Schindelin
2006-12-22 19:25   ` Johannes Schindelin
2006-12-22  8:44 ` Alex Riesen
2006-12-22 12:18   ` Johannes Schindelin
2006-12-22 16:09     ` Alex Riesen
  -- strict thread matches above, loose matches on Subject: below --
2007-01-09 14:03 Johannes Schindelin
2007-01-09 17:25 ` Alex Riesen
2007-01-09 23:47 ` Junio C Hamano
2007-01-10  0:22   ` Johannes Schindelin
2007-01-10  0:36     ` Junio C Hamano
2007-01-10  0:54       ` Johannes Schindelin

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=200612221905.02915.jnareb@gmail.com \
    --to=jnareb@gmail.com \
    --cc=Johannes.Schindelin@gmx.de \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.