git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Yann Simon <yann.simon.fr@gmail.com>
To: Robin Rosenberg <robin.rosenberg.lists@dewire.com>
Cc: "Shawn O. Pearce" <spearce@spearce.org>, git <git@vger.kernel.org>
Subject: Re: [PATCH JGIT] Add "compare with index" action.
Date: Mon, 23 Feb 2009 10:32:47 +0100	[thread overview]
Message-ID: <551f769b0902230132l6fd70f20xa3d59a5df6768395@mail.gmail.com> (raw)
In-Reply-To: <200902221738.40753.robin.rosenberg.lists@dewire.com>

2009/2/22 Robin Rosenberg <robin.rosenberg.lists@dewire.com>:
> fredag 20 februari 2009 09:20:29 skrev Yann Simon <yann.simon.fr@gmail.com>:
>> In the Compare With... menu, the "compare with index" action opens
>> a diff editor that compares the workspace version of a file and its
>> index version.
>
> The appearance in the menu is a bit odd. "Compare with" is already in the menu
> context as that is the name of the menu that hold the Compare with index. So the
> menu name should be really be just "Git Index".

Yes, you're right.
I can change the labels to:
CompareWithIndexAction_label=Git Index
CompareWithIndexAction_tooltip=Compare with Git's index version

>> The local file can be modified and saved.
>>
>> The staged version can be modified and saved. This updates the index.
>> For this, add methods into GitIndex to allow to specify a content
>> different from the file.
>
> One would expect this feature to work at any level of the project, not just files. That
> won't be a showstopper though.

Yes of course. In that case, we would need to display a tree of modifications.
That could be done in a second step.

-- yann

  reply	other threads:[~2009-02-23  9:34 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-02-20  8:20 [PATCH JGIT] Add "compare with index" action Yann Simon
2009-02-22 16:38 ` Robin Rosenberg
2009-02-23  9:32   ` Yann Simon [this message]
  -- strict thread matches above, loose matches on Subject: below --
2009-02-19 15:54 Yann Simon
2009-02-20  8:12 ` Yann Simon
2009-02-12 14:18 Yann Simon
2009-02-11 15:44 Yann Simon

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=551f769b0902230132l6fd70f20xa3d59a5df6768395@mail.gmail.com \
    --to=yann.simon.fr@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=robin.rosenberg.lists@dewire.com \
    --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).