René Scharfe b5f325cb4a 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. Signed-off-by: Rene Scharfe <l.s.r@web.de> Tested-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2016-09-26 07:15:28 -07:00
lib	git-gui: stop using deprecated merge syntax	2016-09-26 07:15:28 -07:00
macosx	git-gui: Make git-gui lib dir configurable at runime	2014-08-10 12:48:28 +01:00
po	git-gui: sv.po: Update Swedish translation (547t0f0u)	2015-04-18 12:03:50 +01:00
windows	git-gui: chmod +x po2msg, windows/git-gui.sh	2014-01-18 17:06:41 +00:00
.gitattributes	git-gui: set whitespace warnings appropriate to this project	2011-11-30 11:35:28 +00:00
.gitignore	git-gui: Honor a config.mak in git-gui's top level	2007-10-13 22:14:14 -04:00
GIT-VERSION-GEN	git-gui: set version 0.20	2015-04-18 12:15:32 +01:00
Makefile	git-gui: Make git-gui lib dir configurable at runime	2014-08-10 12:48:28 +01:00
git-gui--askpass	git-gui: ensure correct application termination in git-gui--askpass	2010-08-18 23:19:24 +01:00
git-gui.sh	git-gui: reinstate support for Tcl 8.4	2015-01-13 00:42:03 +00:00