All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Rémi Vanicat" <vanicat@debian.org>
To: git mailing list <git@vger.kernel.org>
Subject: Re: Ediff interactive add
Date: Mon, 14 Jan 2013 20:57:49 +0100	[thread overview]
Message-ID: <87fw23wn9e.fsf@debian.org> (raw)
In-Reply-To: <50EFF882.5010206@mpp.mpg.de> (Frederik Beaujean's message of "Fri, 11 Jan 2013 12:33:22 +0100")

Frederik Beaujean <beaujean-rVlqnlWY17WELgA04lAiVw@public.gmane.org>
writes:

> On 13-01-11 01:47 AM, Samuel Wales wrote:
>> I have more on this, but if possible it would be best to make ediff do
>> that natively.  I don't know if that's possible.
> Thanks for your prompt replies. The reason I looked for this feature
> is that it is available in the package git-emacs. There I can choose
> Git - 
> Add to index - Select changes in current file. Then ediff starts, and
> I can modify the buffer named <index>:FILENAME at will.
> After I answer 'y' to 'Quit this Ediff session?',  another question comes up
> 'Add changes to the git index? (y or n)'. With 'y' I see the message
> Saving file /tmp/git-emacs-tmp6991oXZ...'
>
> So I guess all it takes is saving a temporary file and adding its
> content to the index. Given my lack of experience in lisp programming,
> I don't know how hard it actually is to implement in magit,
> though. But a quick look into the source code of git-emacs revealed
> this function
>

[...]

> I would be very happy if this became available in magit.

Could you test what has just been pushed in master, it should do it.

-- 
Rémi Vanicat

           reply	other threads:[~2013-01-14 19:58 UTC|newest]

Thread overview: expand[flat|nested]  mbox.gz  Atom feed
 [parent not found: <50EFF882.5010206@mpp.mpg.de>]

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=87fw23wn9e.fsf@debian.org \
    --to=vanicat@debian.org \
    --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.