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

Merge branch 'cb/maint-mergetool-no-tty'

2010-09-03T16:43:44Z

* cb/maint-mergetool-no-tty: mergetool: Remove explicit references to /dev/tty Conflicts: git-mergetool.sh

mergetool: Remove explicit references to /dev/tty

2010-08-20T21:09:04Z

mergetool used /dev/tty to switch back to receiving input from the user via inside a block with a redirected stdin. This harms testability, so change mergetool to save its original stdin to an alternative fd in this block and restore it for those sub-commands that need the original stdin. Includes additional compatibility fix from Jonathan Nieder. Tested-by: Jonathan Nieder Signed-off-by: Charles Bailey Signed-off-by: Junio C Hamano

mergetool: Skip autoresolved paths

2010-08-17T20:58:13Z

When mergetool is run without path limiters it loops over each entry in 'git ls-files -u'. This includes autoresolved paths. Teach mergetool to only merge files listed in 'rerere status' when rerere is enabled. There are some subtle but harmless changes in behavior. We now call cd_to_toplevel when no paths are given. We do this because 'rerere status' paths are always relative to the root. This is beneficial for the non-rerere use as well in that mergetool now runs against all unmerged files regardless of the current directory. This also slightly tweaks the output when run without paths to be more readable. The old output: Merging the files: foo bar baz The new output: Merging: foo bar baz Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

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