aboutsummaryrefslogtreecommitdiff
path: root/git-mergetool.sh
Commit message (Collapse)AuthorAge
* scripts: Add placeholders for OPTIONS_SPECJunio C Hamano2007-11-06
| | | | | | | | | --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 <gitster@pobox.com>
* mergetool: avoid misleading message "Resetting to default..."Steffen Prohaska2007-10-18
| | | | | | | | | | | 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 <prohaska@zib.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* mergetool: add support for ECMergeSteffen Prohaska2007-10-18
| | | | | | | | Add support to mergetool for ECMerge available from http://www.elliecomputing.com/Products/merge_overview.asp Signed-off-by: Steffen Prohaska <prohaska@zib.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* mergetool: use path to mergetool in config var mergetool.<tool>.pathSteffen Prohaska2007-10-18
| | | | | | | | | | | | | | | | | 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.<tool>.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 <prohaska@zib.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* mergetool: Fix typo in options passed to kdiff3Theodore Ts'o2007-09-28
| | | | | | Fix missing double hyphens in "-L1" and "-L2" Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
* mergetool: fix emerge when running in a subdirectoryTheodore Ts'o2007-09-28
| | | | | | | | | | 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" <tytso@mit.edu>
* Mergetool generating blank files (1.5.3)Junio C Hamano2007-09-28
| | | | | | | | | | 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 <gitster@pobox.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
* Supplant the "while case ... break ;; esac" idiomDavid Kastrup2007-09-23
| | | | | | | | | | | | | | | | | | | | | | 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 <dak@gnu.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Rewrite "git-frotz" to "git frotz"Junio C Hamano2007-07-02
| | | | | | This uses the remove-dashes target to replace "git-frotz" to "git frotz". Signed-off-by: Junio C Hamano <gitster@pobox.com>
* git-mergetool: Make default selection of merge-tool more intelligentTheodore Ts'o2007-06-10
| | | | | | | | | Make git-mergetool prefer meld under GNOME, and kdiff3 under KDE. When considering emerge and vimdiff, check $VISUAL and $EDITOR to see which the user might prefer. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> Cc: Josh Triplett <josh@freedesktop.org>
* [PATCH] git-mergetool: Allow gvimdiff to be used as a mergetoolDan McGee2007-06-10
| | | | | Signed-off-by: Dan McGee <dpmcgee@gmail.com> Acked-by: "Theodore Ts'o" <tytso@mit.edu>
* Fix typo in git-mergetoolJosh Triplett2007-06-06
| | | | | Signed-off-by: Josh Triplett <josh@freedesktop.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* mergetool: Clean up description of files and prompts for merge resolutionsTheodore Ts'o2007-03-29
| | | | | | | This fixes complaints from Junio for how messages and prompts are printed when resolving symlink and deleted file merges. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
* mergetool: Make git-rm quiet when resolving a deleted file conflictTheodore Ts'o2007-03-29
| | | | Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
* mergetool: Add support for Apple Mac OS X's opendiff commandTheodore Ts'o2007-03-29
| | | | | Signed-off-by: Arjen Laarhoven <arjen@yaph.org> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
* mergetool: Fix abort command when resolving symlinks and deleted filesTheodore Ts'o2007-03-29
| | | | Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
* mergetool: Remove spurious error message if merge.tool config option not setTheodore Ts'o2007-03-29
| | | | Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
* mergetool: factor out common codeTheodore Ts'o2007-03-29
| | | | | | | | | Create common function check_unchanged(), save_backup() and remove_backup(). Also fix some minor whitespace issues while we're at it. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
* mergetool: portability fix: don't use reserved word functionTheodore Ts'o2007-03-29
| | | | Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
* mergetool: portability fix: don't assume true is in /binTheodore Ts'o2007-03-29
| | | | Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
* mergetool: Don't error out in the merge case where the local file is deletedTheodore Ts'o2007-03-29
| | | | | | | | | If the file we are trying to merge resolve is in git-ls-files -u, then skip the file existence test. If the file isn't reported in git-ls-files, then check to see if the file exists or not to give an appropriate error message. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
* mergetool: Replace use of "echo -n" with printf(1) to be more portableTheodore Ts'o2007-03-29
| | | | Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
* mergetool: print an appropriate warning if merge.tool is unknownTheodore Ts'o2007-03-18
| | | | | | Also add support for vimdiff Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
* mergetool: Add support for vimdiff.James Bowes2007-03-18
| | | | | Signed-off-by: James Bowes <jbowes@dangerouslyinc.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
* Add git-mergetool to run an appropriate merge conflict resolution programTheodore Ts'o2007-03-13
The git-mergetool program can be used to automatically run an appropriate merge resolution program to resolve merge conflicts. It will automatically run one of kdiff3, tkdiff, meld, xxdiff, or emacs emerge programs. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-18 21:18:45 +0000