git, branch gitgui-0.14.0

Merge branch 'ss/git-gui-mergetool'

2011-03-25T08:26:47Z

git-gui: detect the use of MUI langauge packs on Windows

2011-03-25T08:26:31Z

The Tcl msgcat package doesn't detect the use of a multi-lingual language pack on Windows 7. This means that a user may have their display language set to Japanese but the system installed langauge was English. This patch reads the relevent registry key to fix this before loading in the locale specific parts of git-gui. Signed-off-by: Pat Thoyts

mergetool--lib: Add Beyond Compare 3 as a tool

2011-02-27T08:47:34Z

Signed-off-by: Sebastian Schuberth Signed-off-by: Junio C Hamano

mergetool--lib: Sort tools alphabetically for easier lookup

2011-02-27T08:47:13Z

Signed-off-by: Sebastian Schuberth Signed-off-by: Junio C Hamano

git-gui: fetch/prune all entry appears last

2011-02-24T00:11:50Z

The user might have got used to the order the remotes appeared previously. Lets add the all entry last so the all entry does not confuse previous users. Signed-off-by: Heiko Voigt Tested-by: Jens Lehmann Signed-off-by: Pat Thoyts

git-gui: fetch/prune all entry only for more than one entry

2011-02-24T00:11:45Z

In case there is only one remote a fetch/prune all entry is redundant. Signed-off-by: Heiko Voigt Tested-by: Jens Lehmann Signed-off-by: Pat Thoyts

git-gui: Include version check and test for tearoff menu entry

2011-02-15T00:20:36Z

The --all option for git fetch was added in v1.6.6 so ensure we have a usable version before adding the menu items. Sometimes people use tearoff menus and these offset the entry indices by one. Acked-by: Heiko Voigt Signed-off-by: Pat Thoyts

git-gui: teach fetch/prune menu to do it for all remotes

2011-02-14T12:15:36Z

The commandline fetch already has this option for some time. Since this was not available at the time git gui was written lets implement it now. Signed-off-by: Heiko Voigt Signed-off-by: Pat Thoyts

git-gui: refactor remote submenu creation into subroutine

2011-02-14T12:10:54Z

Signed-off-by: Heiko Voigt Signed-off-by: Pat Thoyts

git-gui: always default to the last merged branch in remote delete

2011-02-13T00:47:24Z

This is useful if you are directly working together with other developers pushing feature branches on a shared remote. You typically push feature branches to the remote so others can review. Once they are satisfied and the branch is merged into the main branch it needs to be deleted on the server. Since we did not yet have a preselected default branch in the remote delete dialog lets use the last merged branch if it is found on the server. Signed-off-by: Heiko Voigt Signed-off-by: Pat Thoyts