From: Robin Rosenberg <robin.rosenberg.lists@dewire.com>
To: Yann Simon <yann.simon.fr@gmail.com>
Cc: "Shawn O. Pearce" <spearce@spearce.org>, git <git@vger.kernel.org>
Subject: Re: [PATCH JGIT] Add "compare with Git Index" action.
Date: Wed, 11 Mar 2009 00:22:53 +0100 [thread overview]
Message-ID: <200903110022.53854.robin.rosenberg.lists@dewire.com> (raw)
In-Reply-To: <49B63ADC.4080009@gmail.com>
tisdag 10 mars 2009 11:03:08 skrev Yann Simon <yann.simon.fr@gmail.com>:
> In the Compare With... menu, the "Git Index" action opens
> a diff editor that compares the workspace version of a file and its
> 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.
>
> Signed-off-by: Yann Simon <yann.simon.fr@gmail.com>
> ---
> Changed comapred to previous version:
> - fix saving the index version.
Saving works, but the diff regions aren't updated on save. When there is a diff
this would give us the partial staging similar to git gui, if only (not your fault) the
commit dialog would allow us to make a distinction between changes in the
workdir and the index.
-- robin
next prev parent reply other threads:[~2009-03-10 23:24 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-10 10:03 [PATCH JGIT] Add "compare with Git Index" action Yann Simon
2009-03-10 23:22 ` Robin Rosenberg [this message]
2009-03-13 10:28 ` Yann Simon
2009-03-13 22:26 ` Robin Rosenberg
-- strict thread matches above, loose matches on Subject: below --
2009-03-03 14:04 Yann Simon
2009-03-07 0:31 ` Robin Rosenberg
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=200903110022.53854.robin.rosenberg.lists@dewire.com \
--to=robin.rosenberg.lists@dewire.com \
--cc=git@vger.kernel.org \
--cc=spearce@spearce.org \
--cc=yann.simon.fr@gmail.com \
/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).