René Scharfe <l.s.r@xxxxxx> writes: >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.s.r@xxxxxx> >> 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 <j6t@xxxxxxxx> >> Reviewed-by: Stefan Beller <sbeller@xxxxxxxxxx> >> Signed-off-by: Rene Scharfe <l.s.r@xxxxxx> >> Signed-off-by: Pat Thoyts <patthoyts@xxxxxxxxxxxxxxxxxxxxx> > >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é As this is one of the ones already staged to git's 'next' I'll make this as a separate commit on top. -- Pat Thoyts http://www.patthoyts.tk/ PGP fingerprint 2C 6E 98 07 2C 59 C8 97 10 CE 11 E6 04 E0 B9 DD