path: root/Documentation/git-mergetool.txt
AgeCommit message (Collapse)Author
2008-01-07Documentation: rename gitlink macro to linkgitDan McGee
Between AsciiDoc 8.2.2 and 8.2.3, the following change was made to the stock Asciidoc configuration: @@ -149,7 +153,10 @@ # Inline macros. # Backslash prefix required for escape processing. # (?s) re flag for line spanning. -(?su)[\\]?(?P<name>\w(\w|-)*?):(?P<target>\S*?)(\[(?P<attrlist>.*?)\])= + +# Explicit so they can be nested. +(?su)[\\]?(?P<name>(http|https|ftp|file|mailto|callto|image|link)):(?P<target>\S*?)(\[(?P<attrlist>.*?)\])= + # Anchor: [[[id]]]. Bibliographic anchor. (?su)[\\]?\[\[\[(?P<attrlist>[\w][\w-]*?)\]\]\]=anchor3 # Anchor: [[id,xreflabel]] This default regex now matches explicit values, and unfortunately in this case gitlink was being matched by just 'link', causing the wrong inline macro template to be applied. By renaming the macro, we can avoid being matched by the wrong regex. Signed-off-by: Dan McGee <> Signed-off-by: Junio C Hamano <>
2007-10-18mergetool: add support for ECMergeSteffen Prohaska
Add support to mergetool for ECMerge available from Signed-off-by: Steffen Prohaska <> Signed-off-by: Shawn O. Pearce <>
2007-10-18mergetool: use path to mergetool in config var mergetool.<tool>.pathSteffen Prohaska
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 <> Signed-off-by: Shawn O. Pearce <>
2007-06-10[PATCH] git-mergetool: Allow gvimdiff to be used as a mergetoolDan McGee
Signed-off-by: Dan McGee <> Acked-by: "Theodore Ts'o" <>
2007-06-07War on whitespaceJunio C Hamano
This uses "git-apply --whitespace=strip" to fix whitespace errors that have crept in to our source files over time. There are a few files that need to have trailing whitespaces (most notably, test vectors). The results still passes the test, and build result in Documentation/ area is unchanged. Signed-off-by: Junio C Hamano <>
2007-05-04Document 'opendiff' value in config.txt and git-mergetool.txtArjen Laarhoven
Signed-off-by: Arjen Laarhoven <> Signed-off-by: Junio C Hamano <>
2007-03-29Fix minor formatting issue in man page for git-mergetoolTheodore Ts'o
Signed-off-by: "Theodore Ts'o" <>
2007-03-19mergetool: Add support for vimdiff.James Bowes
Signed-off-by: James Bowes <> Signed-off-by: "Theodore Ts'o" <>
2007-03-14Add git-mergetool to run an appropriate merge conflict resolution programTheodore Ts'o
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" <>