git/git-mergetool.sh, branch v2.6.2

mergetool--lib: set IFS for difftool and mergetool

2015-05-20T20:13:42Z

git-sh-setup sets IFS but it is not used by git-difftool--helper. Set IFS in git-mergetool--lib so that the mergetool scriptlets, difftool, and mergetool do not need to do so. Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

mergetool: simplify conditionals

2014-11-21T19:27:53Z

Combine the $last_status checks into a single conditional. Replace $last_status and $rollup_status with a single variable. Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

Merge branch 'da/mergetool-temporary-directory'

2014-10-21T20:28:42Z

Allow a temporary directory specified to be used while running "git mergetool" backend. * da/mergetool-temporary-directory: t7610-mergetool: add test cases for mergetool.writeToTemp mergetool: add an option for writing to a temporary directory

Merge branch 'da/mergetool-tool-help'

2014-10-21T20:28:37Z

Allow "git mergetool --help" to run outside a Git repository. * da/mergetool-tool-help: difftool: don't assume that default sh is sane mergetool: don't require a work tree for --tool-help git-sh-setup: move GIT_DIR initialization into a function mergetool: use more conservative temporary filenames test-lib-functions: adjust style to match CodingGuidelines t7610-mergetool: prefer test_config over git config

Merge branch 'da/mergetool-temporary-filename'

2014-10-21T20:28:20Z

Tweak the names of the three throw-away files "git mergetool" comes up with to feed the merge tool backend, so that a file with a single dot in its name in the original (e.g. "hello.c") will have only one dot in these variants (e.g. "hello_BASE_4321.c"). * da/mergetool-temporary-filename: mergetool: use more conservative temporary filenames

mergetool: add an option for writing to a temporary directory

2014-10-16T19:09:51Z

Teach mergetool to write files in a temporary directory when 'mergetool.writeToTemp' is true. This is helpful for tools such as Eclipse which cannot cope with multiple copies of the same file in the worktree. Suggested-by: Charles Bailey Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

mergetool: use more conservative temporary filenames

2014-10-16T19:07:48Z

Avoid filenames with multiple dots so that overly-picky tools do not misinterpret their extension. Previously, foo/bar.ext in the worktree would result in e.g. ./foo/bar.ext.BASE.1234.ext This can be improved by having only a single .ext and using underscore instead of dot so that the extension cannot be misinterpreted. The resulting path becomes: ./foo/bar_BASE_1234.ext Suggested-by: Sergio Ferrero Helped-by: Junio C Hamano Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

difftool: don't assume that default sh is sane

2014-10-15T21:12:20Z

git-difftool used to create a command list script containing $( ... ) and explicitly calls "sh -c" with this list. Instead, allow mergetool --tool-help to take a mode parameter and call mergetool directly to invoke the show_tool_help function. This mode parameter is intented for use solely by difftool. Signed-off-by: Charles Bailey Helped-by: John Keeping Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

mergetool: don't require a work tree for --tool-help

2014-10-15T21:12:20Z

Signed-off-by: Charles Bailey Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

mergetool: use more conservative temporary filenames

2014-10-15T21:10:52Z