user/sven/git.git/git-mergetool.sh, branch v1.6.4.5

mergetool--lib: simplify API usage by removing more global variables

2009-04-12T22:19:12Z

The mergetool--lib scriplet was tricky to use because it relied upon the existance of several global shell variables. This removes more global variables so that things are simpler for callers. A side effect is that some variables are recomputed each time run_merge_tool() is called, but the overhead for recomputing them is justified by the simpler implementation. Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

Fix misspelled mergetool.keepBackup

2009-04-11T19:20:17Z

In several places mergetool.keepBackup was misspelled as merge.keepBackup. Signed-off-by: Ferry Huberts Signed-off-by: Junio C Hamano

difftool/mergetool: refactor commands to use git-mergetool--lib

2009-04-08T07:25:24Z

This consolidates the common functionality from git-mergetool and git-difftool--helper into a single git-mergetool--lib scriptlet. Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

mergetool: use $( ... ) instead of `backticks`

2009-04-08T05:19:56Z

This makes mergetool consistent with Documentation/CodingGuidelines. Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

difftool/mergetool: add diffuse as merge and diff tool

2009-04-08T05:19:56Z

This adds diffuse as a built-in merge tool. Signed-off-by: Sebastian Pipping Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

git-mergetool: add new merge tool TortoiseMerge

2009-04-08T05:19:55Z

TortoiseMerge comes with TortoiseSVN or TortoiseGit for Windows. It can only be used as a merge tool with an existing base file. It cannot be used without a base nor as a diff tool. The documentation only mentions the slash '/' as command line option prefix, which refused to work, but the parser also accepts the dash '-' See http://code.google.com/p/msysgit/issues/detail?id=226 Signed-off-by: Markus Heidelberg Signed-off-by: Junio C Hamano

git-mergetool/difftool: make (g)vimdiff workable under Windows

2009-04-08T05:19:55Z

Under Windows vimdiff and gvimdiff are not available as symbolic links, but as batch files vimdiff.bat and gvimdiff.bat. These files weren't found by 'type vimdiff' which led to the following error: The merge tool vimdiff is not available as 'vimdiff' Even if they were found, it wouldn't work to invoke these batch files from git-mergetool. To solve this, use vim and gvim (vim.exe and gvim.exe) and pass the -d command line switch over to them. Signed-off-by: Markus Heidelberg Signed-off-by: Junio C Hamano

Merge branch 'cb/mergetool'

2009-02-06T03:40:35Z

* cb/mergetool: mergetool: fix running mergetool in sub-directories mergetool: Add a test for running mergetool in a sub-directory mergetool: respect autocrlf by using checkout-index

mergetool: fix running mergetool in sub-directories

2009-01-31T18:28:33Z

The previous fix to mergetool to use checkout-index instead of cat-file broke running mergetool anywhere except the root of the repository. This fixes it by using the correct relative paths for temporary files and index paths. Signed-off-by: Charles Bailey Signed-off-by: Junio C Hamano

mergetool: respect autocrlf by using checkout-index

2009-01-27T09:13:19Z

Previously, git mergetool used cat-file which does not perform git to worktree conversion. This changes mergetool to use git checkout-index instead which means that the temporary files used for mergetool use the correct line endings for the platform. Signed-off-by: Charles Bailey Signed-off-by: Junio C Hamano