git/git-gui, branch v2.10.3

Merge branch 'rs/git-gui-use-modern-git-merge-syntax' into maint

2016-10-11T21:20:37Z

The original command line syntax for "git merge", which was "git merge HEAD ...", 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

Merge branch 'js/git-gui-commit-gpgsign' into maint

2016-09-29T23:49:38Z

"git commit-tree" stopped reading commit.gpgsign configuration variable that was meant for Porcelain "git commit" in Git 2.9; we forgot to update "git gui" to look at the configuration to match this change. * js/git-gui-commit-gpgsign: git-gui: respect commit.gpgsign again

Merge branch 'rs/use-modern-git-merge-syntax' of git-gui into rs/git-gui-use-modern-git-merge-syntax

2016-09-26T14:16:48Z

* 'rs/use-modern-git-merge-syntax' of git-gui: git-gui: stop using deprecated merge syntax

Merge branch 'js/commit-gpgsign' of ../git-gui into js/git-gui-commit-gpgsign

2016-09-11T21:54:46Z

* 'js/commit-gpgsign' of ../git-gui: git-gui: respect commit.gpgsign again

Merge branch 'sy/i18n' of git-gui

2016-09-07T17:24:25Z

* 'sy/i18n' of git-gui: git-gui: update Japanese information git-gui: update Japanese translation git-gui: add Japanese language code git-gui: apply po template to Japanese translation git-gui: consistently use the same word for "blame" in Japanese git-gui: consistently use the same word for "remote" in Japanese

git-gui/po/glossary/txt-to-pot.sh: use the $( ... ) construct for command substitution

2015-12-27T23:33:13Z

The Git CodingGuidelines prefer the $(...) construct for command substitution instead of using the backquotes `...`. The backquoted form is the traditional method for command substitution, and is supported by POSIX. However, all but the simplest uses become complicated quickly. In particular, embedded command substitutions and/or the use of double quotes require careful escaping with the backslash character. The patch was generated by: for _f in $(find . -name "*.sh") do perl -i -pe 'BEGIN{undef $/;} s/`(.+?)`/\$(\1)/smg' "${_f}" done and then carefully proof-read. Signed-off-by: Elia Pinto Reviewed-by: Jonathan Nieder Signed-off-by: Junio C Hamano

Merge tag 'gitgui-0.20.0' of http://repo.or.cz/r/git-gui

2015-04-19T01:35:48Z

git-gui 0.20.0 * tag 'gitgui-0.20.0' of http://repo.or.cz/r/git-gui: git-gui: set version 0.20 git-gui: sv.po: Update Swedish translation (547t0f0u) git-gui i18n: Updated Bulgarian translation (547t,0f,0u) git-gui: Makes chooser set 'gitdir' to the resolved path git-gui: Fixes chooser not accepting gitfiles git-gui: reinstate support for Tcl 8.4 git-gui: fix problem with gui.maxfilesdisplayed git-gui: fix verbose loading when git path contains spaces. git-gui/gitk: Do not depend on Cygwin's "kill" command on Windows git-gui: add configurable tab size to the diff view git-gui: Make git-gui lib dir configurable at runime git-gui i18n: Updated Bulgarian translation (520t,0f,0u) L10n: vi.po (543t): Init translation for Vietnamese git-gui: align the new recursive checkbox with the radiobuttons. git-gui: Add a 'recursive' checkbox in the clone menu.

Merge git://repo.or.cz/git-gui

2014-06-26T20:44:11Z

* git://repo.or.cz/git-gui: git-gui: tolerate major version changes when comparing the git version git-gui: show staged submodules regardless of ignore config

Merge branch 'jl/use-vsatisfy-correctly-for-2.0'

2014-05-19T17:35:24Z

* jl/use-vsatisfy-correctly-for-2.0: git-gui: tolerate major version changes when comparing the git version

Merge tag 'gitgui-0.19.0' of http://repo.or.cz/r/git-gui

2014-01-21T21:16:17Z

git-gui 0.19.0 * tag 'gitgui-0.19.0' of http://repo.or.cz/r/git-gui: git-gui 0.19 git-gui: chmod +x po2msg, windows/git-gui.sh git-gui: fallback right pane to packed widgets with Tk 8.4 git-gui i18n: Added Bulgarian translation git-gui l10n: Add 29 more terms to glossary git-gui i18n: Initial glossary in Bulgarian