From: "Shawn O. Pearce" <spearce@spearce.org>
To: Ferry Huberts <ferry.huberts@pelagic.nl>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: Re: RESEND [PATCH 1/1] Ensure consistent usage of mergetool.keepBackup
Date: Thu, 9 Apr 2009 08:30:33 -0700 [thread overview]
Message-ID: <20090409153033.GN23604@spearce.org> (raw)
In-Reply-To: <cfb81044a29899f9dd0b46f10447243632c50c94.1239108064.git.ferry.huberts@pelagic.nl>
Ferry Huberts <ferry.huberts@pelagic.nl> wrote:
> In several places merge.keepBackup is used i.s.o.
> mergetool.keepBackup. This patch makes it all
> consistent.
>
> Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
> ---
> This patch is rebased on v1.6.2.2
>
> contrib/difftool/git-difftool.txt | 2 +-
> git-gui/git-gui.sh | 2 +-
> git-gui/lib/mergetool.tcl | 2 +-
> git-mergetool.sh | 2 +-
> 4 files changed, 4 insertions(+), 4 deletions(-)
git-gui patches should be sent by themselves as they apply to
git-gui.git which is then merged into git.git every so often.
Yesterday I broke the git-gui part out by hand and applied it to
git-gui.git. You should break this patch down and send Junio the
non-git-gui half so he can more easily apply it to git.git.
--
Shawn.
next prev parent reply other threads:[~2009-04-09 15:32 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-07 15:33 [[PATCH 1/1] Ensure consistent usage of mergetool.keepBackup Ferry Huberts
2009-04-09 15:30 ` Shawn O. Pearce [this message]
2009-04-09 15:45 ` [PATCH v2 1/2] Ensure consistent usage of mergetool.keepBackup in git Ferry Huberts
2009-04-10 3:27 ` David Aguilar
2009-04-10 6:58 ` Ferry Huberts (Pelagic)
2009-04-10 7:43 ` David Aguilar
2009-04-10 8:18 ` David Aguilar
2009-04-10 8:25 ` Ferry Huberts (Pelagic)
2009-04-10 14:48 ` Markus Heidelberg
2009-04-11 12:04 ` Charles Bailey
2009-04-09 15:45 ` [PATCH v2 2/2] Ensure consistent usage of mergetool.keepBackup in git-gui Ferry Huberts
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=20090409153033.GN23604@spearce.org \
--to=spearce@spearce.org \
--cc=ferry.huberts@pelagic.nl \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).