path: root/
AgeCommit message (Collapse)Author
2011-08-05misc-sh: fix up whitespace in some other .sh files.Jon Seymour
I found that the patched 4 files were different when this filter is applied. expand -i | unexpand --first-only This patch contains the corrected files. Signed-off-by: Jon Seymour <> Signed-off-by: Junio C Hamano <>
2011-06-30Merge branch 'da/git-prefix-everywhere' into nextJunio C Hamano
* da/git-prefix-everywhere: t/ Add GIT_PREFIX tests git-mergetool--lib: Make vimdiff retain the current directory git: Remove handling for GIT_PREFIX setup: Provide GIT_PREFIX to built-ins
2011-05-26git-mergetool--lib: Make vimdiff retain the current directoryDavid Aguilar
When using difftool with vimdiff it can be unexpected that the current directory changes to the root of the project. Tell vim to chdir to the value of $GIT_PREFIX to fix this. Care is taken to quote the variable so that vim expands it. This avoids problems when directory names contain spaces. Signed-off-by: David Aguilar <> Reported-by: Frédéric Heitzmann <> Signed-off-by: Junio C Hamano <>
2011-05-01Pass empty file to p4merge where no base is suitable.Ciaran Jessup
Modify the p4merge client command to pass a reference to an empty file instead of the local file when no base revision available. In the situation where a merge tries to add a file from one branch into a branch that already contains that file (by name), p4merge currently seems to have successfully automatically resolved the 'conflict' when it is opened (correctly if the files differed by just whitespace for example) but leaves the save button disabled. This means the user of the p4merge client cannot commit the resolved changes back to disk and merely exits, leaving the original (merge-conflicted) file intact on the disk. Provide an empty base file to p4merge so that it leaves the save button enabled. This will allow saving of the auto-resolution to disk. Signed-off-by: Ciaran Jessup <> Signed-off-by: Junio C Hamano <>
2011-03-20Merge branch 'ss/mergetool--lib'Junio C Hamano
* ss/mergetool--lib: mergetool--lib: Add Beyond Compare 3 as a tool mergetool--lib: Sort tools alphabetically for easier lookup
2011-02-28mergetool--lib: Add Beyond Compare 3 as a toolSebastian Schuberth
Signed-off-by: Sebastian Schuberth <> Tested-by: Chris Packham <> Signed-off-by: Junio C Hamano <>
2011-02-28mergetool--lib: Sort tools alphabetically for easier lookupSebastian Schuberth
Signed-off-by: Sebastian Schuberth <> Tested-by: Chris Packham <> Signed-off-by: Junio C Hamano <>
2011-02-25mergetool-lib: call vim in readonly mode for diffsMichael J Gruber
When [g]vimdiff is called for files which are opened already, the editor complains about the existing swap file. But we do not want to write anything when called from difftool. So, make difftool use "-R" for the vim family. This - prevents the use of a swap file and - marks the buffers readonly. Signed-off-by: Michael J Gruber <> Signed-off-by: Junio C Hamano <>
2010-09-29mergetool-lib: make the three-way diff the default for vim/gvimDan McGee
The original vimdiff/gvimdiff configuration is now available by using 'vimdiff2' or 'gvimdiff2' as the preferred merge tool. Signed-off-by: Dan McGee <> Signed-off-by: Junio C Hamano <>
2010-09-15mergetool-lib: add a three-way diff view for vim/gvimDan McGee
When the base version is available, use a three-way, four panel view by default. This shows the (local, base, remote) revisions up top and the merged result by itself in the lower pane. All revisions will still scroll together by default, and the cursor still defaults to the merged result edit pane. Signed-off-by: Dan McGee <> Signed-off-by: Junio C Hamano <>
2010-09-15mergetool-lib: combine vimdiff and gvimdiff run blocksDan McGee
They are nearly identical outside of the foreground flag, which can safely be passed to both vim and gvim. The merge tool itself is named in $merge_tool_path. Signed-off-by: Dan McGee <> Signed-off-by: Junio C Hamano <>
2010-08-20mergetool: Remove explicit references to /dev/ttyCharles Bailey
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 <>
2010-01-29add shebang line to git-mergetool--lib.shJeff King
Even though this script is expected to be sourced instead of executed on its own, the #!/bin/sh line provides simple documentation about what format the file is in. In particular, the lack of such a line was confusing the valgrind support of our test scripts, which assumed that any executable without a #!-line should be intercepted and run through valgrind. So during valgrind-enabled tests, any script sourcing this file actually sourced the valgrind interception script instead. Signed-off-by: Jeff King <> Signed-off-by: Junio C Hamano <>
2009-11-25Merge branch 'rs/work-around-grep-opt-insanity'Junio C Hamano
* rs/work-around-grep-opt-insanity: Protect scripted Porcelains from GREP_OPTIONS insanity mergetool--lib: simplify guess_merge_tool() Conflicts:
2009-11-23mergetool--lib: simplify guess_merge_tool()René Scharfe
Use a case statement instead of calling grep to find out if the editor's name contains the string "vim". Remove the check for emacs, as this branch did the same as the default one anyway. Signed-off-by: Rene Scharfe <> Signed-off-by: Junio C Hamano <>
2009-10-28mergetool--lib: add p4merge as a pre-configured mergetool optionScott Chacon
Add p4merge to the set of built-in diff/merge tools, and update bash completion and documentation. Signed-off-by: Scott Chacon <> Signed-off-by: Junio C Hamano <>
2009-05-24mergetool--lib: add support for araxis mergeDavid Aguilar
Araxis merge is now a built-in diff/merge tool. This adds araxis to git-completion and updates the documentation to mention araxis. Signed-off-by: David Aguilar <> Signed-off-by: Junio C Hamano <>
2009-05-09mergetool--lib: specialize diff options for emerge and ecmergeDavid Aguilar
The ecmerge documentation mentions the following form: ecmerge --mode=diff2 $1 $2 Since git-difftool is about diffing, we should use that instead of --mode=merge2. Likewise, this drops the $MERGED argument to emerge, as discussed on the git list ($gmane/117930). Signed-off-by: David Aguilar <> Signed-off-by: Junio C Hamano <>
2009-04-12mergetool--lib: simplify API usage by removing more global variablesDavid Aguilar
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 <>
2009-04-08difftool/mergetool: refactor commands to use git-mergetool--libDavid Aguilar
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 <>