From: Caleb Cushing <xenoterracide@gmail.com>
To: Charles Bailey <charles@hashpling.org>
Cc: Junio C Hamano <gitster@pobox.com>,
git@vger.kernel.org, Nanako Shiraishi <nanako3@lavabit.com>
Subject: Re: [PATCH] mergetool merge/skip/abort at prompt
Date: Wed, 28 Jan 2009 04:53:12 -0500 [thread overview]
Message-ID: <81bfc67a0901280153v33993d73p63687c78df555b48@mail.gmail.com> (raw)
In-Reply-To: <20090128084756.GA28493@hashpling.org>
> With this change, it would seem to be more logical to ask whether the
> merge tool is to be run before creating the temporary files, removing
> the need for them to be cleaned up if the answer is no. I think that
> this would be cleaner overall.
I agree, but to be honest, I couldn't get the logic wrapped around my
head, so I did it this way. refactoring does seem to be the best idea,
but I don't understand enough of it yet to do so.
--
Caleb Cushing
http://xenoterracide.blogspot.com
prev parent reply other threads:[~2009-01-28 9:54 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-28 6:56 [PATCH] mergetool merge/skip/abort at prompt Caleb Cushing
2009-01-28 7:01 ` Caleb Cushing
2009-01-28 8:04 ` David Aguilar
2009-01-28 9:50 ` Caleb Cushing
2009-01-28 8:47 ` Charles Bailey
2009-01-28 9:53 ` Caleb Cushing [this message]
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=81bfc67a0901280153v33993d73p63687c78df555b48@mail.gmail.com \
--to=xenoterracide@gmail.com \
--cc=charles@hashpling.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=nanako3@lavabit.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).