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

Merge branch 'al/mergetool-printf-fix'

2013-02-14T18:29:37Z

* al/mergetool-printf-fix: difftool--helper: fix printf usage git-mergetool: print filename when it contains %

git-mergetool: print filename when it contains %

2013-02-08T21:10:06Z

If git-mergetool was invoked with files with a percent sign (%) in their names, it would print an error. For example, if you were calling mergetool on a file called "%2F": printf: %2F: invalid directive Do not pass random string to printf as if it were a valid format. Use format string "%s" and pass the string as data to be formatted instead. Signed-off-by: Asheesh Laroia Signed-off-by: Junio C Hamano

git-mergetool: move show_tool_help to mergetool--lib

2013-01-25T19:07:30Z

This is the first step in unifying "git difftool --tool-help" and "git mergetool --tool-help". Signed-off-by: John Keeping Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

mergetool: style fixes

2012-08-24T04:30:51Z

This script is one of the sizeable ones that tempted people to copy its "neibouring style" in their new code, but was littered with styles incompatible with our style guide. - use one tab, not four spaces, per indent level; - long lines can be wrapped after '|', '&&', or '||' for readability. - structures like "if .. then .. else .. fi", "while .. do .. done" are split into lines in such a way that does not require unnecessary semicolon. - case, esac and case-arms align at the same column. Signed-off-by: Junio C Hamano

mergetool: support --tool-help option like difftool does

2012-07-23T21:42:39Z

This way we do not have to risk the list of tools going out of sync between the implementation and the documentation. In the same spirit as bf73fc2 (difftool: print list of valid tools with '--tool-help', 2012-03-29), trim the list of merge backends in the documentation. We do not want to have a complete list of valid tools; we only want a list to help people guess what kind of things the tools do to be specified there, and refer them to --tool-help for a complete list. Signed-off-by: Junio C Hamano

mergetool: Provide an empty file when needed

2012-01-23T19:50:22Z

Some merge tools cannot cope when $LOCAL, $BASE, or $REMOTE are missing. $BASE can be missing when two branches independently add the same filename. Provide an empty file to make these tools happy. When a delete/modify conflict occurs, $LOCAL and $REMOTE can also be missing. We have special case code to handle such case so this change may not affect that codepath, but try to be consistent and create an empty file for them anyway. Reported-by: Jason Wenger Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

Merge branch 'jm/mergetool-pathspec'

2011-10-10T22:56:18Z

* jm/mergetool-pathspec: mergetool: no longer need to save standard input mergetool: Use args as pathspec to unmerged files

mergetool: no longer need to save standard input

2011-09-26T16:39:45Z

Earlier code wanted to run merge_file and prompt_after_failed_merge both of which wanted to read from the standard input of the entire script inside a while loop, which read from a pipe, and in order to do so, it redirected the original standard input to another file descriptor. We no longer need to do so after the previous change. Signed-off-by: Junio C Hamano

mergetool: Use args as pathspec to unmerged files

2011-09-26T16:39:36Z

Mergetool now treats its path arguments as a pathspec (like other git subcommands), restricting action to the given files and directories. Files matching the pathspec are filtered so mergetool only acts on unmerged paths; previously it would assume each path argument was in an unresolved state, and get confused when it couldn't check out their other stages. Running "git mergetool subdir" will prompt to resolve all conflicted blobs under subdir. Signed-off-by: Jonathon Mah Acked-by: David Aguilar Signed-off-by: Junio C Hamano

git-mergetool: check return value from read

2011-09-20T00:41:49Z

Mostly fixed already by 6b44577 (mergetool: check return value from read, 2011-07-01). Catch two uses it missed. Signed-off-by: Jay Soffian Signed-off-by: Junio C Hamano