summaryrefslogtreecommitdiff
path: root/git-gui
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'cb/git-gui-ttk-style'Junio C Hamano2018-04-251-5/+10
|\
| * Merge branch 'cb/ttk-style' of git-gui into cb/git-gui-ttk-stylecb/git-gui-ttk-styleJunio C Hamano2018-03-051-5/+10
| |\
* | \ Merge branch 'bp/git-gui-bind-kp-enter'Junio C Hamano2018-04-251-0/+1
|\ \ \
| * \ \ Merge branch 'bp/bind-kp-enter' of git-gui into bp/git-gui-bind-kp-enterbp/git-gui-bind-kp-enterJunio C Hamano2018-03-021-0/+1
| |\ \ \ | | |/ / | |/| / | | |/
* | | Merge branch 'bb/ssh-key-files' of git-gui into bb/git-gui-ssh-key-filesbb/git-gui-ssh-key-filesJunio C Hamano2018-03-021-1/+4
|\ \ \ | |/ / |/| / | |/
* | Merge branch 'js/misc-git-gui-stuff' of ../git-guiJunio C Hamano2018-01-092-1/+27
|\ \ | |/
* | Merge branch 'ls/git-gui-no-double-utf8-author-name'Junio C Hamano2017-12-191-3/+9
|\ \
| * \ Merge branch 'ls/no-double-utf8-author-name' of ../git-gui into ls/git-gui-no...ls/git-gui-no-double-utf8-author-nameJunio C Hamano2017-12-051-3/+9
| |\ \ | | |/
* | | Merge branch 'jn/reproducible-build' of ../git-gui into jn/reproducible-buildjn/reproducible-buildJunio C Hamano2017-11-221-1/+1
|\ \ \ | |/ / |/| / | |/
* | Merge branch 'tz/fsf-address-update' of ../git-gui into tz/fsf-address-updatetz/fsf-address-updateJunio C Hamano2017-11-091-2/+1
|\ \ | |/
* | Merge branch 'ma/up-to-date'Junio C Hamano2017-09-101-1/+1
|\ \
| * | treewide: correct several "up-to-date" to "up to date"ma/up-to-dateMartin Ă…gren2017-08-231-1/+1
* | | Merge branch 'js/msgfmt-on-windows' of ../git-gui into js/git-gui-msgfmt-on-w...js/git-gui-msgfmt-on-windowsJunio C Hamano2017-07-252-7/+12
|\ \ \ | |/ / |/| / | |/
* | Fix build with core.autocrlf=trueJohannes Schindelin2017-05-101-0/+1
* | Merge tag 'gitgui-0.21.0' of git://repo.or.cz/git-guipt/gitgui-updatesJunio C Hamano2016-10-2026-1923/+1982
|\ \ | |/
* | Merge branch 'va/git-gui-i18n'Junio C Hamano2016-10-033-3/+3012
|\ \
| * \ Merge branch 'va/i18n' of ../git-gui into va/git-gui-i18nva/git-gui-i18nJunio C Hamano2016-09-263-3/+3012
| |\ \ | | |/
* | | Merge branch 'rs/git-gui-use-modern-git-merge-syntax'Junio C Hamano2016-10-031-6/+1
|\ \ \ | |/ / |/| |
| * | Merge branch 'rs/use-modern-git-merge-syntax' of git-gui into rs/git-gui-use-...rs/git-gui-use-modern-git-merge-syntaxJunio C Hamano2016-09-261-6/+1
| |\ \ | | |/
* | | Merge branch 'js/git-gui-commit-gpgsign'Junio C Hamano2016-09-151-0/+3
|\ \ \
| * \ \ Merge branch 'js/commit-gpgsign' of ../git-gui into js/git-gui-commit-gpgsignjs/git-gui-commit-gpgsignJunio C Hamano2016-09-111-0/+3
| |\ \ \ | | |/ / | |/| / | | |/
* | | Merge branch 'sy/i18n' of git-guisy/git-gui-i18n-jaJunio C Hamano2016-09-071-1309/+1438
|\ \ \ | |/ / |/| / | |/
* | git-gui/po/glossary/txt-to-pot.sh: use the $( ... ) construct for command sub...Elia Pinto2015-12-271-2/+2
* | Merge tag 'gitgui-0.20.0' of http://repo.or.cz/r/git-guiJunio C Hamano2015-04-1810-1773/+4690
|\ \ | |/
* | Merge git://repo.or.cz/git-guiJunio C Hamano2014-06-262-1/+8
|\ \ | |/
* | Merge branch 'jl/use-vsatisfy-correctly-for-2.0'Junio C Hamano2014-05-191-2/+2
|\ \ | |/
* | Merge tag 'gitgui-0.19.0' of http://repo.or.cz/r/git-guiJunio C Hamano2014-01-217-12/+3032
|\ \ | |/
* | Merge git://repo.or.cz/git-guiJunio C Hamano2013-12-098-17/+56
|\ \ | |/
* | Merge tag 'gitgui-0.18.0' of git://repo.or.cz/git-guiJunio C Hamano2013-06-168-22/+40
|\ \ | |/
* | Merge tag 'gitgui-0.17.0' of git://repo.or.cz/git-guiJunio C Hamano2012-10-1715-37/+65
|\ \ | |/
* | Merge branch 'master' of git://repo.or.cz/git-guiJunio C Hamano2011-12-1317-49/+339
|\ \ | |/
* | Merge git://repo.or.cz/git-guiJunio C Hamano2011-10-169-29/+159
|\ \ | |/
* | Merge git-gui 0.14.0Junio C Hamano2011-03-2614-437/+3371
|\ \ | |/
* | Merge branch 'master' of git://repo.or.cz/git-guiJunio C Hamano2010-11-053-23/+90
|\ \ | |/
* | Merge git://repo.or.cz/git-guiJunio C Hamano2010-09-156-411/+454
|\ \ | |/
* | Merge git://repo.or.cz/git-gui into pt/git-guiJunio C Hamano2010-08-029-33/+112
|\ \ | |/
* | Merge git://repo.or.cz/git-guiv1.7.0-rc2Junio C Hamano2010-02-0734-2514/+3126
|\ \ | |/
* | Merge branch 'maint' of git://git.spearce.org/git-gui into maintJunio C Hamano2010-01-245-23/+48
|\ \ | |/
* | Merge git://repo.or.cz/git-guiJunio C Hamano2009-12-094-13/+37
|\ \ | |/
* | Merge git://repo.or.cz/git-guiJunio C Hamano2009-10-277-24/+2276
|\ \ | |/
* | Merge git://repo.or.cz/git-guiJunio C Hamano2009-05-0122-657/+1254
|\ \ | |/
* | Merge git://repo.or.cz/git-guiJunio C Hamano2008-12-1711-423/+3157
|\ \ | |/
* | Merge git://repo.or.cz/git-guiJunio C Hamano2008-12-021-16/+27
|\ \ | |/
* | Merge git://repo.or.cz/git-guiJunio C Hamano2008-11-305-1533/+4243
|\ \ | |/
* | Merge git://repo.or.cz/git-guiJunio C Hamano2008-11-167-311/+1457
|\ \ | |/
* | Merge git://repo.or.cz/git-guiJunio C Hamano2008-11-124-17/+41
|\ \ | |/
* | Merge git://repo.or.cz/git-guiJunio C Hamano2008-11-0117-190/+1080
|\ \ | |/
* | Merge git://repo.or.cz/git-guiShawn O. Pearce2008-09-259-141/+793
|\ \ | |/
* | Merge updated git-gui and gitk that call each otherJunio C Hamano2008-09-068-119/+900
|\ \ | |/
* | Merge branch 'maint' of git://repo.or.cz/git-gui into maintJunio C Hamano2008-09-065-381/+431
|\ \ | |/