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

Allow git-mergetool to handle paths with a leading space

2008-01-08T05:00:54Z

Signed-off-by: Rogan Dawes

Open external merge tool with original file extensions for all three files

2007-12-06T02:43:20Z

Before this change, conflicted files were open in external merge tool with temporary filenames like REMOTE.$$ and LOCAL.$$. This way meld was unable to recognize these files and syntax highlighting feature was unusable. Help such merge tools by giving temporar files the same extension as the original. Signed-off-by: Pini Reznik Signed-off-by: Junio C Hamano

scripts: Add placeholders for OPTIONS_SPEC

2007-11-06T09:50:02Z

--text follows this line-- These commands currently lack OPTIONS_SPEC; allow people to easily list with "git grep 'OPTIONS_SPEC=$'" what they can help improving. Signed-off-by: Junio C Hamano

mergetool: avoid misleading message "Resetting to default..."

2007-10-18T23:59:58Z

If no mergetool is configured in the configuration variable merge.tool the resetting message should not be printed. This is fixed. The message is only printed if a tool is configured but the entry in merge.tool is invalid. Signed-off-by: Steffen Prohaska Signed-off-by: Shawn O. Pearce

mergetool: add support for ECMerge

2007-10-18T07:46:24Z

Add support to mergetool for ECMerge available from http://www.elliecomputing.com/Products/merge_overview.asp Signed-off-by: Steffen Prohaska Signed-off-by: Shawn O. Pearce

mergetool: use path to mergetool in config var mergetool..path

2007-10-18T07:46:24Z

This commit adds a mechanism to provide absolute paths to the external programs called by 'git mergetool'. A path can be specified in the configuation variable mergetool..path. The configuration variable is similar to how we name branches and remotes. It is extensible if we need to specify more details about a tool. The mechanism is especially useful on Windows, where external programs are unlikely to be in PATH. [sp: Fixed a few minor issues prior to applying] Signed-off-by: Steffen Prohaska Signed-off-by: Shawn O. Pearce

mergetool: Fix typo in options passed to kdiff3

2007-09-29T02:26:05Z

Fix missing double hyphens in "-L1" and "-L2" Signed-off-by: "Theodore Ts'o"

mergetool: fix emerge when running in a subdirectory

2007-09-29T01:23:22Z

Only pass the basename of the output filename when to emerge, since emerge interprets non-absolute pathnames relative to the containing directory of the output buffer. Thanks to Kelvie Wong for pointing this out. Signed-off-by: "Theodore Ts'o"

Mergetool generating blank files (1.5.3)

2007-09-29T00:13:14Z

When mergetool is run from a subdirectory, "ls-files -u" nicely limits the output to conflicted files in that directory, but we need to give the full path to cat-file plumbing to grab the contents of stages. Signed-off-by: Junio C Hamano Signed-off-by: "Theodore Ts'o"

Supplant the "while case ... break ;; esac" idiom

2007-09-23T23:12:00Z

A lot of shell scripts contained stuff starting with while case "$#" in 0) break ;; esac and similar. I consider breaking out of the condition instead of the body od the loop ugly, and the implied "true" value of the non-matching case is not really obvious to humans at first glance. It happens not to be obvious to some BSD shells, either, but that's because they are not POSIX-compliant. In most cases, this has been replaced by a straight condition using "test". "case" has the advantage of being faster than "test" on vintage shells where "test" is not a builtin. Since none of them is likely to run the git scripts, anyway, the added readability should be worth the change. A few loops have had their termination condition expressed differently. Signed-off-by: David Kastrup Signed-off-by: Junio C Hamano