Junio C Hamano ff65e796f0 Merge branch 'rs/use-modern-git-merge-syntax' of git-gui into rs/git-gui-use-modern-git-merge-syntax ...

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

2016-09-26 07:16:48 -07:00

..

lib

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

macosx

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

2015-04-18 18:35:48 -07:00

po

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

2015-12-27 15:33:13 -08:00

windows

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

2014-01-21 13:16:17 -08:00

.gitattributes

Merge branch 'master' of git://repo.or.cz/git-gui

2011-12-13 16:48:24 -08:00

.gitignore

…

git-gui--askpass

…

git-gui.sh

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

2015-04-18 18:35:48 -07:00

GIT-VERSION-GEN

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

2015-04-18 18:35:48 -07:00

Makefile

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

2015-04-18 18:35:48 -07:00