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

..

about.tcl

git-gui: use themed tk widgets with Tk 8.5

2010-01-27 17:13:52 -08:00

blame.tcl

git-gui: correct spelling errors in comments

2013-11-15 20:44:08 +00:00

branch_checkout.tcl

git-gui: use themed tk widgets with Tk 8.5

2010-01-27 17:13:52 -08:00

branch_create.tcl

git-gui: use themed tk widgets with Tk 8.5

2010-01-27 17:13:52 -08:00

branch_delete.tcl

git-gui: use themed tk widgets with Tk 8.5

2010-01-27 17:13:52 -08:00

branch_rename.tcl

git-gui: use full dialog width for old name when renaming branch

2010-10-07 23:00:33 +01:00

branch.tcl

git-gui: Always use absolute path to all git executables

2007-07-09 01:17:09 -04:00

browser.tcl

git-gui: fix display of path in browser title

2011-10-19 14:13:15 +01:00

checkout_op.tcl

git-gui: run post-checkout hook on checkout

2009-04-05 12:58:26 -07:00

choose_font.tcl

git-gui: use themed tk widgets with Tk 8.5

2010-01-27 17:13:52 -08:00

choose_repository.tcl

git-gui: Makes chooser set 'gitdir' to the resolved path

2015-03-07 12:29:03 +00:00

choose_rev.tcl

git-gui: set suitable extended window manager hints.

2011-10-19 14:26:29 +01:00

class.tcl

git-gui: set suitable extended window manager hints.

2011-10-19 14:26:29 +01:00

commit.tcl

git-gui: remove .git/CHERRY_PICK_HEAD after committing

2012-09-17 11:59:05 +01:00

console.tcl

git-gui: use themed tk widgets with Tk 8.5

2010-01-27 17:13:52 -08:00

database.tcl

git-gui: use themed tk widgets with Tk 8.5

2010-01-27 17:13:52 -08:00

date.tcl

git-gui: Localize commit/author dates when displaying them

2007-09-10 01:54:16 -04:00

diff.tcl

git-gui: add configurable tab size to the diff view

2014-10-06 10:34:52 +01:00

encoding.tcl

git-gui: Optimize encoding name resolution using a lookup table.

2008-09-24 12:48:32 -07:00

error.tcl

git-gui: use themed tk widgets with Tk 8.5

2010-01-27 17:13:52 -08:00

git-gui.ico

git-gui: Improve the application icon on Windows.

2007-12-02 23:05:10 -05:00

index.tcl

git-gui: correct spelling errors in comments

2013-11-15 20:44:08 +00:00

line.tcl

git-gui: theme the search and line-number entry fields on blame screen

2011-10-19 12:44:39 +01:00

logo.tcl

git-gui: Refactor Henrik Nyh's logo into its own procedure

2007-10-10 01:12:15 -04:00

merge.tcl

git-gui: stop using deprecated merge syntax

2016-09-26 07:15:28 -07:00

mergetool.tcl

git-gui: fix the mergetool launcher for the Beyond Compare tool.

2013-02-22 20:13:21 +00:00

option.tcl

git-gui: add configurable tab size to the diff view

2014-10-06 10:34:52 +01:00

remote_add.tcl

git-gui: use themed tk widgets with Tk 8.5

2010-01-27 17:13:52 -08:00

remote_branch_delete.tcl

git-gui: always default to the last merged branch in remote delete

2011-02-13 00:47:24 +00:00

remote.tcl

git-gui: avoid an error message when removing the last remote

2013-06-15 23:36:27 +01:00

search.tcl

git-gui: use a tristate to control the case mode in the searchbar

2011-10-21 22:28:23 +01:00

shortcut.tcl

git-gui: fix usage of _gitworktree when creating shortcut for windows

2010-07-30 09:57:26 +01:00

spellcheck.tcl

git-gui: correct spelling errors in comments

2013-11-15 20:44:08 +00:00

sshkey.tcl

git-gui: fix spelling error in sshkey.tcl

2011-10-31 08:58:18 +00:00

status_bar.tcl

git-gui: fix git-gui crash due to uninitialized variable

2012-01-22 23:16:03 +00:00

themed.tcl

git-gui: set suitable extended window manager hints.

2011-10-19 14:26:29 +01:00

tools_dlg.tcl

git-gui: use themed tk widgets with Tk 8.5

2010-01-27 17:13:52 -08:00

tools.tcl

git-gui: include the file path in guitools confirmation dialog

2011-10-21 23:15:10 +01:00

transport.tcl

git-gui: set suitable extended window manager hints.

2011-10-19 14:26:29 +01:00

win32_shortcut.js

git-gui: Use proper Windows shortcuts instead of bat files

2007-10-12 23:07:58 -04:00

win32.tcl

git-gui: fix shortcut creation on cygwin

2010-07-30 10:05:26 +01:00