git-commit-vandalism/git-gui/lib
Junio C Hamano 0bc409dab9 Merge branch 'rs/git-gui-use-modern-git-merge-syntax' into maint
The original command line syntax for "git merge", which was "git
merge <msg> HEAD <parent>...", has been deprecated for quite some
time, and "git gui" was the last in-tree user of the syntax.  This
is finally fixed, so that we can move forward with the deprecation.

* rs/git-gui-use-modern-git-merge-syntax:
  git-gui: stop using deprecated merge syntax
2016-10-11 14:20:37 -07:00
..
about.tcl
blame.tcl Merge git://repo.or.cz/git-gui 2013-12-09 14:57:00 -08:00
branch_checkout.tcl
branch_create.tcl
branch_delete.tcl
branch_rename.tcl
branch.tcl
browser.tcl Merge branch 'master' of git://repo.or.cz/git-gui 2011-12-13 16:48:24 -08:00
checkout_op.tcl
choose_font.tcl
choose_repository.tcl git-gui 0.20.0 2015-04-18 18:35:48 -07:00
choose_rev.tcl Merge branch 'master' of git://repo.or.cz/git-gui 2011-12-13 16:48:24 -08:00
class.tcl Merge branch 'master' of git://repo.or.cz/git-gui 2011-12-13 16:48:24 -08:00
commit.tcl Merge branch 'js/commit-gpgsign' of ../git-gui into js/git-gui-commit-gpgsign 2016-09-11 14:54:46 -07:00
console.tcl
database.tcl
date.tcl
diff.tcl git-gui 0.20.0 2015-04-18 18:35:48 -07:00
encoding.tcl
error.tcl
git-gui.ico
index.tcl Merge git://repo.or.cz/git-gui 2013-12-09 14:57:00 -08:00
line.tcl Merge branch 'master' of git://repo.or.cz/git-gui 2011-12-13 16:48:24 -08:00
logo.tcl
merge.tcl Merge branch 'rs/use-modern-git-merge-syntax' of git-gui into rs/git-gui-use-modern-git-merge-syntax 2016-09-26 07:16:48 -07:00
mergetool.tcl git-gui 0.18.0 2013-06-16 20:06:55 -07:00
option.tcl git-gui 0.20.0 2015-04-18 18:35:48 -07:00
remote_add.tcl
remote_branch_delete.tcl
remote.tcl git-gui 0.18.0 2013-06-16 20:06:55 -07:00
search.tcl Merge branch 'master' of git://repo.or.cz/git-gui 2011-12-13 16:48:24 -08:00
shortcut.tcl
spellcheck.tcl Merge git://repo.or.cz/git-gui 2013-12-09 14:57:00 -08:00
sshkey.tcl Merge branch 'master' of git://repo.or.cz/git-gui 2011-12-13 16:48:24 -08:00
status_bar.tcl git-gui 0.17.0 2012-10-17 15:55:46 -07:00
themed.tcl Merge branch 'master' of git://repo.or.cz/git-gui 2011-12-13 16:48:24 -08:00
tools_dlg.tcl
tools.tcl Merge branch 'master' of git://repo.or.cz/git-gui 2011-12-13 16:48:24 -08:00
transport.tcl Merge branch 'master' of git://repo.or.cz/git-gui 2011-12-13 16:48:24 -08:00
win32_shortcut.js
win32.tcl