From: Pierre Habouzit <madcoder@debian.org>
To: Peter Baumann <waste.manager@gmx.de>
Cc: git@vger.kernel.org, Russ Brown <pickscrape@gmail.com>,
Kelvie Wong <kelvie@ieee.org>
Subject: Re: Mergetool generating blank files (1.5.3)
Date: Fri, 28 Sep 2007 08:35:46 +0200 [thread overview]
Message-ID: <20070928063546.GA19299@artemis.corp> (raw)
In-Reply-To: <20070928051503.GA19815@xp.machine.xx>
[-- Attachment #1: Type: text/plain, Size: 1062 bytes --]
On Fri, Sep 28, 2007 at 05:15:03AM +0000, Peter Baumann wrote:
> FWIW, xxdiff has support to handle halfway merged files, so that if git
> could merge some hunks already for you (e.g. rerere kicked in), you
> don't have to redo the _whole_ merge by hand, just call
>
> xxdiff -U file/with/mergemarkers/inside
>
> and it will do the right thing. Not sure if the other tools could handle
> it, but any pointers appreciated, because it often happens to me that
> only one hunk out of several wasn't merged automatically by git. And
> mergetool wants to always redo the whole merge, which isn't the best it
> can do.
For what I've seen, it's how meld works, and I find it nice too. Meld
is quite slow (python + gnomeish doesn't help) but well, I don't merge
things that often, so like said I think I'll give it a try for a while
and see if it has what it takes :)
--
·O· Pierre Habouzit
··O madcoder@debian.org
OOO http://www.madism.org
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
next prev parent reply other threads:[~2007-09-28 6:35 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-09-27 18:31 Mergetool generating blank files (1.5.3) Kelvie Wong
2007-09-27 18:57 ` Pierre Habouzit
2007-09-27 19:00 ` Russ Brown
2007-09-27 19:11 ` Pierre Habouzit
2007-09-27 22:23 ` Theodore Tso
2007-09-27 22:28 ` Pierre Habouzit
2007-09-28 5:15 ` Peter Baumann
2007-09-28 6:35 ` Pierre Habouzit [this message]
2007-09-27 19:12 ` Jeff King
2007-09-27 19:16 ` Pierre Habouzit
2007-09-27 19:41 ` Jeff King
2007-09-27 19:24 ` Kelvie Wong
2007-09-27 19:58 ` Junio C Hamano
2007-09-27 20:12 ` Kelvie Wong
2007-09-27 20:28 ` Junio C Hamano
2007-09-27 20:38 ` Kelvie Wong
2007-09-27 20:47 ` Junio C Hamano
2007-09-27 20:51 ` Junio C Hamano
2007-09-27 21:17 ` Kelvie Wong
2007-09-27 21:22 ` Kelvie Wong
2007-09-27 21:33 ` Junio C Hamano
2007-09-27 21:41 ` Junio C Hamano
2007-09-27 22:23 ` Kelvie Wong
2007-09-27 22:52 ` Theodore Tso
2007-09-28 4:17 ` Kelvie Wong
2007-09-28 6:19 ` David Kastrup
2007-09-27 22:35 ` Theodore Tso
2007-09-28 8:43 ` David Kågedal
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=20070928063546.GA19299@artemis.corp \
--to=madcoder@debian.org \
--cc=git@vger.kernel.org \
--cc=kelvie@ieee.org \
--cc=pickscrape@gmail.com \
--cc=waste.manager@gmx.de \
/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).