Re: RESEND [PATCH 1/1] Ensure consistent usage of mergetool.keepBackup

From: Shawn O. Pearce <spearce@spearce.org>
Date: Apr 9, 2009, 15:30 UTC
Message-ID: <20090409153033.GN23604@spearce.org>
In-Reply-To: <cfb81044a29899f9dd0b46f10447243632c50c94.1239108064.git.ferry.huberts@pelagic.nl>

Ferry Huberts <ferry.huberts@pelagic.nl> wrote:

Show 13 quoted lines

> 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.