author | Junio C Hamano <gitster@pobox.com> | |
Tue, 3 Aug 2010 22:16:38 +0000 (15:16 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Tue, 3 Aug 2010 22:16:38 +0000 (15:16 -0700) | ||
commit | e9aa24123d0ff8914a34a9f40f23bf736ec2bfb7 | |
tree | d472e18b2c3fd15754e50f1511459844a992f740 | tree | snapshot |
parent | 7d808125a0197e5660a57f77d14937604b16e39a | commit | diff |
parent | c01a29c74ff991faf3012882fbf676b182b8893f | commit | diff |
Merge branch 'pt/git-gui' into maint
* pt/git-gui:
git-gui: fix size and position of window panes on startup
git-gui: mc cannot be used before msgcat has been loaded
git-gui: use textconv filter for diff and blame
git-gui: Avoid using the <<Copy>> binding as a menu accelerator on win32
git-gui: fix shortcut creation on cygwin
git-gui: fix PATH environment for mingw development environment
git-gui: fix usage of _gitworktree when creating shortcut for windows
git-gui: fix "Explore Working Copy" for Windows again
git-gui: fix usage of themed widgets variable
git-gui: Handle failure of core.worktree to identify the working directory.
git-gui: check whether systems nice command works or disable it
* pt/git-gui:
git-gui: fix size and position of window panes on startup
git-gui: mc cannot be used before msgcat has been loaded
git-gui: use textconv filter for diff and blame
git-gui: Avoid using the <<Copy>> binding as a menu accelerator on win32
git-gui: fix shortcut creation on cygwin
git-gui: fix PATH environment for mingw development environment
git-gui: fix usage of _gitworktree when creating shortcut for windows
git-gui: fix "Explore Working Copy" for Windows again
git-gui: fix usage of themed widgets variable
git-gui: Handle failure of core.worktree to identify the working directory.
git-gui: check whether systems nice command works or disable it