Sign in
googlers
/
jrn
/
git
/
bf23fe5c37d62f37267d31d4afa1a1444f70cdac
/
git-mergetool.sh
b2a51c1
mergetool: do not enable hideResolved by default
by Jonathan Nieder
· 3 years, 10 months ago
9d9cf23
mergetool: add per-tool support and overrides for the hideResolved flag
by Seth House
· 4 years ago
de8dafb
mergetool: break setup_tool out into separate initialization function
by Seth House
· 4 years ago
98ea309
mergetool: add hideResolved configuration
by Seth House
· 4 years ago
7e6d6f7
mergetool: use shell variable magic instead of `awk`
by Johannes Sixt
· 6 years ago
8b01465
mergetool: dissect strings with shell variable magic instead of `expr`
by Johannes Sixt
· 6 years ago
05fb872
mergetool: use get_merge_tool function
by Denton Liu
· 6 years ago
063f2bd
mergetool: accept -g/--[no-]gui as arguments
by Denton Liu
· 6 years ago
d651a54
mergetool: don't suggest to continue after last file
by Nicholas Guriev
· 6 years ago
d0e0cfe
mergetool: fix running in subdir when rerere enabled
by Richard Hansen
· 8 years ago
c1b0d3a
mergetool: take the "-O" out of $orderfile
by Richard Hansen
· 8 years ago
654311b
mergetool: honor -O<orderfile>
by David Aguilar
· 8 years ago
57937f7
mergetool: honor diff.orderFile
by David Aguilar
· 8 years ago
08221e3
mergetool: move main program flow into a main() function
by David Aguilar
· 8 years ago
8827b3a
mergetool: add copyright
by David Aguilar
· 8 years ago
b974143
Merge branch 'nf/mergetool-prompt'
by Junio C Hamano
· 9 years ago
cce076e
difftool/mergetool: make the form of yes/no questions consistent
by Nikola Forró
· 9 years ago
a298604
mergetool: honor tempfile configuration when resolving delete conflicts
by David Aguilar
· 9 years ago
faaab8d
mergetool: support delete/delete conflicts
by David Aguilar
· 9 years ago
719518f
mergetool--lib: set IFS for difftool and mergetool
by David Aguilar
· 10 years ago
98a2602
mergetool: simplify conditionals
by David Aguilar
· 10 years ago
a46af59
Merge branch 'da/mergetool-temporary-directory'
by Junio C Hamano
· 10 years ago
e96e98b
Merge branch 'da/mergetool-tool-help'
by Junio C Hamano
· 10 years ago
02f4db8
Merge branch 'da/mergetool-temporary-filename'
by Junio C Hamano
· 10 years ago
8f0cb41
mergetool: add an option for writing to a temporary directory
by David Aguilar
· 10 years ago
eab335c
mergetool: use more conservative temporary filenames
by David Aguilar
· 10 years ago
4fb4b02
difftool: don't assume that default sh is sane
by Charles Bailey
· 10 years ago
7bfb7c3
mergetool: don't require a work tree for --tool-help
by Charles Bailey
· 10 years ago
9c66cd3
mergetool: use more conservative temporary filenames
by David Aguilar
· 10 years ago
1cb4937
git-mergetool.sh: avoid "test <cond> -a/-o <cond>"
by Elia Pinto
· 11 years ago
4ecc63d
mergetool: run prompt only if guessed tool
by Felipe Contreras
· 11 years ago
ba56d70
Merge branch 'al/mergetool-printf-fix'
by Junio C Hamano
· 12 years ago
59cf706
git-mergetool: print filename when it contains %
by Asheesh Laroia
· 12 years ago
4a8273a
git-mergetool: move show_tool_help to mergetool--lib
by John Keeping
· 12 years ago
f8750a0
mergetool: style fixes
by Junio C Hamano
· 12 years ago
109859e
mergetool: support --tool-help option like difftool does
by Junio C Hamano
· 12 years ago
ec245ba
mergetool: Provide an empty file when needed
by David Aguilar
· 13 years ago
5fbdb9c
Merge branch 'jm/mergetool-pathspec'
by Junio C Hamano
· 13 years ago
6d9990a
mergetool: no longer need to save standard input
by Junio C Hamano
· 13 years ago
3e8e691
mergetool: Use args as pathspec to unmerged files
by Jonathon Mah
· 13 years ago
e622f41
git-mergetool: check return value from read
by Jay Soffian
· 13 years ago
6b44577
mergetool: check return value from read
by Junio C Hamano
· 14 years ago
ff7f089
mergetool: Teach about submodules
by Jonathon Mah
· 14 years ago
2f59c94
mergetool: don't skip modify/remove conflicts
by Martin von Zweigbergk
· 14 years ago
1998f4c
Merge branch 'cb/maint-mergetool-no-tty'
by Junio C Hamano
· 14 years ago
af31471
mergetool: Remove explicit references to /dev/tty
by Charles Bailey
· 14 years ago
bb0a484
mergetool: Skip autoresolved paths
by David Aguilar
· 14 years ago
47d6592
mergetool--lib: simplify API usage by removing more global variables
by David Aguilar
· 16 years ago
70af4e9
Fix misspelled mergetool.keepBackup
by Ferry Huberts
· 16 years ago
21d0ba7
difftool/mergetool: refactor commands to use git-mergetool--lib
by David Aguilar
· 16 years ago
9a62d72
mergetool: use $( ... ) instead of `backticks`
by David Aguilar
· 16 years ago
1c0f3d2
difftool/mergetool: add diffuse as merge and diff tool
by Sebastian Pipping
· 16 years ago
b98c212
git-mergetool: add new merge tool TortoiseMerge
by Markus Heidelberg
· 16 years ago
bad4273
git-mergetool/difftool: make (g)vimdiff workable under Windows
by Markus Heidelberg
· 16 years ago
b371922
Merge branch 'cb/mergetool'
by Junio C Hamano
· 16 years ago
ff4a185
mergetool: fix running mergetool in sub-directories
by Charles Bailey
· 16 years ago
0ec7b6c
mergetool: respect autocrlf by using checkout-index
by Charles Bailey
· 16 years ago
fb700cb
mergetool: Don't repeat merge tool candidates
by Johannes Gilger
· 16 years ago
71ee483
mergetool: put the cursor on the editable file for Vim
by Markus Heidelberg
· 16 years ago
3827210
Merge branch 'cb/mergetool'
by Junio C Hamano
· 16 years ago
ce2c3eb
git-mergetool: properly handle "git mergetool -- filename"
by David Aguilar
· 16 years ago
162eba8
mergetool: Don't keep temporary merge files unless told to
by Charles Bailey
· 16 years ago
b0169d8
mergetool: Add prompt to continue after failing to merge a file
by Charles Bailey
· 16 years ago
682b451
Add -y/--no-prompt option to mergetool
by Charles Bailey
· 16 years ago
0eea345
Fix some tab/space inconsistencies in git-mergetool.sh
by Charles Bailey
· 16 years ago
641dba4
Remove the use of '--' in merge program invocation
by Patrick Higgins
· 17 years ago
f4e9f78
mergetool: Make ECMerge use the settings as specified by the user in the GUI
by Sebastian Schuberth
· 17 years ago
964473a
Teach git mergetool to use custom commands defined at config time
by Charles Bailey
· 17 years ago
b3ea27e
Changed an internal variable of mergetool to support custom commands
by Charles Bailey
· 17 years ago
44c36d1
Tidy up git mergetool's backup file behaviour
by Charles Bailey
· 17 years ago
2e8fd78
Allow git-mergetool to handle paths with a leading space
by Rogan Dawes
· 17 years ago
c3d51cd
Open external merge tool with original file extensions for all three files
by Pini Reznik
· 17 years ago
8f321a3
scripts: Add placeholders for OPTIONS_SPEC
by Junio C Hamano
· 17 years ago
d279fc1
mergetool: avoid misleading message "Resetting to default..."
by Steffen Prohaska
· 17 years ago
ca8e6b7
mergetool: add support for ECMerge
by Steffen Prohaska
· 17 years ago
e3fa2c7
mergetool: use path to mergetool in config var mergetool.<tool>.path
by Steffen Prohaska
· 17 years ago
208fe3a
mergetool: Fix typo in options passed to kdiff3
by Theodore Ts'o
· 17 years ago
f6e0e55
mergetool: fix emerge when running in a subdirectory
by Theodore Ts'o
· 17 years ago
769f398
Mergetool generating blank files (1.5.3)
by Junio C Hamano
· 17 years ago
822f7c7
Supplant the "while case ... break ;; esac" idiom
by David Kastrup
· 17 years ago
5be6007
Rewrite "git-frotz" to "git frotz"
by Junio C Hamano
· 18 years ago
301ac38
git-mergetool: Make default selection of merge-tool more intelligent
by Theodore Ts'o
· 18 years ago
730b5b4
[PATCH] git-mergetool: Allow gvimdiff to be used as a mergetool
by Dan McGee
· 18 years ago
2571ac6
Fix typo in git-mergetool
by Josh Triplett
· 18 years ago
27090aa
mergetool: Clean up description of files and prompts for merge resolutions
by Theodore Ts'o
· 18 years ago
1346c99
mergetool: Make git-rm quiet when resolving a deleted file conflict
by Theodore Ts'o
· 18 years ago
365cf97
mergetool: Add support for Apple Mac OS X's opendiff command
by Theodore Ts'o
· 18 years ago
5a174f1
mergetool: Fix abort command when resolving symlinks and deleted files
by Theodore Ts'o
· 18 years ago
b7b36f9
mergetool: Remove spurious error message if merge.tool config option not set
by Theodore Ts'o
· 18 years ago
ddc0c49
mergetool: factor out common code
by Theodore Ts'o
· 18 years ago
262c981
mergetool: portability fix: don't use reserved word function
by Theodore Ts'o
· 18 years ago
d1dc695
mergetool: portability fix: don't assume true is in /bin
by Theodore Ts'o
· 18 years ago
ce5b6d7
mergetool: Don't error out in the merge case where the local file is deleted
by Theodore Ts'o
· 18 years ago
20fa04e
mergetool: Replace use of "echo -n" with printf(1) to be more portable
by Theodore Ts'o
· 18 years ago
d6678c2
mergetool: print an appropriate warning if merge.tool is unknown
by Theodore Ts'o
· 18 years ago
9cec653
mergetool: Add support for vimdiff.
by James Bowes
· 18 years ago
c4b4a5a
Add git-mergetool to run an appropriate merge conflict resolution program
by Theodore Ts'o
· 18 years ago