From: Johannes Sixt <j.sixt@viscovery.net>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: 'git diff' in rebase--interactive
Date: Tue, 09 Oct 2007 14:35:13 +0200 [thread overview]
Message-ID: <470B7581.3030301@viscovery.net> (raw)
In-Reply-To: <Pine.LNX.4.64.0710091319400.4174@racer.site>
Johannes Schindelin schrieb:
> On Tue, 9 Oct 2007, Johannes Sixt wrote:
>
>> I wonder for what reason rebase--interactive generates a patch using
>> 'git diff' in the make_patch function. Is this an artefact?
>
> It was an explicit request by people who use git-rebase regularly, and
> missed being able to see the patch in --interactive.
Can we generate the patch with plumbing, diff-{files,index,tree}? They
by-pass any diff drivers.
>> I'd like to get rid of this use of 'git diff' because it invokes
>> external diff drivers, which is totally unwanted if the driver is
>> interactive - like the 'windiff' thing that I posted a week ago.
>
> So you do not want to be able to run git-rebase (without -i)?
It wouldn't work anyway in my use-case (versioned Word documents), but
rebase -m and rebase -i could run without manual intervention as long as
there are no content merges.
In this particular case, I only wanted to amend the message of a commit 3
steps down in the history, and I had not expected any diff drivers to be
fired up.
-- Hannes
next prev parent reply other threads:[~2007-10-09 12:35 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-09 8:51 'git diff' in rebase--interactive Johannes Sixt
2007-10-09 12:22 ` Johannes Schindelin
2007-10-09 12:35 ` Johannes Sixt [this message]
2007-10-09 12:59 ` [PATCH] rebase -i: use diff plumbing instead of porcelain Johannes Schindelin
2007-10-09 14:26 ` Johannes Sixt
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=470B7581.3030301@viscovery.net \
--to=j.sixt@viscovery.net \
--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.