Re: [PATCH] git-gui: stop using deprecated merge syntax

[René Scharfe]

Am 03.10.2016 um 10:30 schrieb Pat Thoyts:
The only problem I see here is that generally git-gui tries to continue
to work with older versions of git as well. So adding a guard using the
git-version procedure should maintain that backwards compatibility.

Makes sense for a stand-alone tool.

I suggest:

From c2716458f05893ca88c05ce211a295a330e74590 Mon Sep 17 00:00:00 2001
From:  René Scharfe <l....@web.de>
Date: Sat, 24 Sep 2016 13:30:22 +0200
Subject: [PATCH] git-gui: stop using deprecated merge syntax

Starting with v2.5.0 git merge can handle FETCH_HEAD internally and
warns when it's called like 'git merge <message> HEAD <commit>' because
that syntax is deprecated.  Use this feature in git-gui and get rid of
that warning.

Tested-by: Johannes Sixt <j...@kdbg.org>
Reviewed-by: Stefan Beller <sbel...@google.com>
Signed-off-by: Rene Scharfe <l....@web.de>
Signed-off-by: Pat Thoyts <pattho...@users.sourceforge.net>

OK, but perhaps move me from From: to Original-patch-by: as the version 
check is a big enough change in itself.  Or add a separate commit for 
it.  Or at least mention that you added the check in the commit message.

Thanks,
René