Commit Graph

97 Commits (b2a51c1b03c44bd888e2f65c764dced571266482)

Author SHA1 Message Date
Jonathan Nieder b2a51c1b03 mergetool: do not enable hideResolved by default 2 years ago
Seth House 9d9cf23031 mergetool: add per-tool support and overrides for the hideResolved flag 2 years ago
Seth House de8dafbada mergetool: break setup_tool out into separate initialization function 2 years ago
Seth House 98ea309b3f mergetool: add hideResolved configuration 2 years ago
Johannes Sixt 7e6d6f7610 mergetool: use shell variable magic instead of `awk` 4 years ago
Johannes Sixt 8b01465510 mergetool: dissect strings with shell variable magic instead of `expr` 4 years ago
Denton Liu 05fb8726cc mergetool: use get_merge_tool function 4 years ago
Denton Liu 063f2bdbf7 mergetool: accept -g/--[no-]gui as arguments 4 years ago
Nicholas Guriev d651a54b8a mergetool: don't suggest to continue after last file 4 years ago
Richard Hansen d0e0cfe745 mergetool: fix running in subdir when rerere enabled 6 years ago
Richard Hansen c1b0d3a010 mergetool: take the "-O" out of $orderfile 6 years ago
David Aguilar 654311bf6e mergetool: honor -O<orderfile> 6 years ago
David Aguilar 57937f70a0 mergetool: honor diff.orderFile 6 years ago
David Aguilar 08221e3fa2 mergetool: move main program flow into a main() function 6 years ago
David Aguilar 8827b3a887 mergetool: add copyright 6 years ago
Nikola Forró cce076e371 difftool/mergetool: make the form of yes/no questions consistent 7 years ago
David Aguilar a2986045e3 mergetool: honor tempfile configuration when resolving delete conflicts 7 years ago
David Aguilar faaab8d571 mergetool: support delete/delete conflicts 7 years ago
David Aguilar 719518f5ce mergetool--lib: set IFS for difftool and mergetool 8 years ago
David Aguilar 98a260220c mergetool: simplify conditionals 8 years ago
David Aguilar 8f0cb41da2 mergetool: add an option for writing to a temporary directory 8 years ago
David Aguilar eab335c46d mergetool: use more conservative temporary filenames 8 years ago
Charles Bailey 4fb4b02d98 difftool: don't assume that default sh is sane 8 years ago
Charles Bailey 7bfb7c357c mergetool: don't require a work tree for --tool-help 8 years ago
David Aguilar 9c66cd3bd0 mergetool: use more conservative temporary filenames 8 years ago
Elia Pinto 1cb4937395 git-mergetool.sh: avoid "test <cond> -a/-o <cond>" 9 years ago
Felipe Contreras 4ecc63d7f9 mergetool: run prompt only if guessed tool 9 years ago
Asheesh Laroia 59cf706b23 git-mergetool: print filename when it contains % 10 years ago
John Keeping 4a8273a3ed git-mergetool: move show_tool_help to mergetool--lib 10 years ago
Junio C Hamano f8750a0ea9 mergetool: style fixes 10 years ago
Junio C Hamano 109859e274 mergetool: support --tool-help option like difftool does 10 years ago
David Aguilar ec245ba049 mergetool: Provide an empty file when needed 11 years ago
Junio C Hamano 6d9990a959 mergetool: no longer need to save standard input 11 years ago
Jonathon Mah 3e8e691abe mergetool: Use args as pathspec to unmerged files 11 years ago
Jay Soffian e622f41dcd git-mergetool: check return value from read 11 years ago
Junio C Hamano 6b445773b7 mergetool: check return value from read 12 years ago
Jonathon Mah ff7f089ed1 mergetool: Teach about submodules 12 years ago
Martin von Zweigbergk 2f59c94704 mergetool: don't skip modify/remove conflicts 12 years ago
Charles Bailey af3147147f mergetool: Remove explicit references to /dev/tty 12 years ago
David Aguilar bb0a484e98 mergetool: Skip autoresolved paths 12 years ago
David Aguilar 47d65924a6 mergetool--lib: simplify API usage by removing more global variables 14 years ago
Ferry Huberts 70af4e9bef Fix misspelled mergetool.keepBackup 14 years ago
David Aguilar 21d0ba7ebb difftool/mergetool: refactor commands to use git-mergetool--lib 14 years ago
David Aguilar 9a62d72dfa mergetool: use $( ... ) instead of `backticks` 14 years ago
Sebastian Pipping 1c0f3d224e difftool/mergetool: add diffuse as merge and diff tool 14 years ago
Markus Heidelberg b98c212a9f git-mergetool: add new merge tool TortoiseMerge 14 years ago
Markus Heidelberg bad4273200 git-mergetool/difftool: make (g)vimdiff workable under Windows 14 years ago
Charles Bailey ff4a18552a mergetool: fix running mergetool in sub-directories 14 years ago
Charles Bailey 0ec7b6c26d mergetool: respect autocrlf by using checkout-index 14 years ago
Johannes Gilger fb700cb067 mergetool: Don't repeat merge tool candidates 14 years ago