Welcome to
mirror list
, hosted at
ThFree Co
, Russian Federation.
git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
index
:
git.kernel.org/pub/scm/git/git.git
main
maint
master
next
seen
todo
Unnamed repository; edit this file 'description' to name the repository.
root
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
git-mergetool.sh
Age
Commit message (
Expand
)
Author
2014-04-22
mergetool: run prompt only if guessed tool
Felipe Contreras
2013-02-14
Merge branch 'al/mergetool-printf-fix'
Junio C Hamano
2013-02-09
git-mergetool: print filename when it contains %
Asheesh Laroia
2013-01-25
git-mergetool: move show_tool_help to mergetool--lib
John Keeping
2012-08-24
mergetool: style fixes
Junio C Hamano
2012-07-24
mergetool: support --tool-help option like difftool does
Junio C Hamano
2012-01-23
mergetool: Provide an empty file when needed
David Aguilar
2011-10-11
Merge branch 'jm/mergetool-pathspec'
Junio C Hamano
2011-09-26
mergetool: no longer need to save standard input
Junio C Hamano
2011-09-26
mergetool: Use args as pathspec to unmerged files
Jonathon Mah
2011-09-20
git-mergetool: check return value from read
Jay Soffian
2011-07-02
mergetool: check return value from read
Junio C Hamano
2011-04-13
mergetool: Teach about submodules
Jonathon Mah
2011-02-17
mergetool: don't skip modify/remove conflicts
Martin von Zweigbergk
2010-09-03
Merge branch 'cb/maint-mergetool-no-tty'
Junio C Hamano
2010-08-21
mergetool: Remove explicit references to /dev/tty
Charles Bailey
2010-08-18
mergetool: Skip autoresolved paths
David Aguilar
2009-04-13
mergetool--lib: simplify API usage by removing more global variables
David Aguilar
2009-04-11
Fix misspelled mergetool.keepBackup
Ferry Huberts
2009-04-08
difftool/mergetool: refactor commands to use git-mergetool--lib
David Aguilar
2009-04-08
mergetool: use $( ... ) instead of `backticks`
David Aguilar
2009-04-08
difftool/mergetool: add diffuse as merge and diff tool
Sebastian Pipping
2009-04-08
git-mergetool: add new merge tool TortoiseMerge
Markus Heidelberg
2009-04-08
git-mergetool/difftool: make (g)vimdiff workable under Windows
Markus Heidelberg
2009-02-06
Merge branch 'cb/mergetool'
Junio C Hamano
2009-01-31
mergetool: fix running mergetool in sub-directories
Charles Bailey
2009-01-27
mergetool: respect autocrlf by using checkout-index
Charles Bailey
2009-01-27
mergetool: Don't repeat merge tool candidates
Johannes Gilger
2009-01-18
mergetool: put the cursor on the editable file for Vim
Markus Heidelberg
2009-01-01
Merge branch 'cb/mergetool'
Junio C Hamano
2008-12-20
git-mergetool: properly handle "git mergetool -- filename"
David Aguilar
2008-12-13
mergetool: Don't keep temporary merge files unless told to
Charles Bailey
2008-12-13
mergetool: Add prompt to continue after failing to merge a file
Charles Bailey
2008-11-15
Add -y/--no-prompt option to mergetool
Charles Bailey
2008-11-15
Fix some tab/space inconsistencies in git-mergetool.sh
Charles Bailey
2008-06-20
Remove the use of '--' in merge program invocation
Patrick Higgins
2008-05-11
mergetool: Make ECMerge use the settings as specified by the user in the GUI
Sebastian Schuberth
2008-03-05
Teach git mergetool to use custom commands defined at config time
Charles Bailey
2008-03-05
Changed an internal variable of mergetool to support custom commands
Charles Bailey
2008-03-05
Tidy up git mergetool's backup file behaviour
Charles Bailey
2008-01-08
Allow git-mergetool to handle paths with a leading space
Rogan Dawes
2007-12-06
Open external merge tool with original file extensions for all three files
Pini Reznik
2007-11-06
scripts: Add placeholders for OPTIONS_SPEC
Junio C Hamano
2007-10-19
mergetool: avoid misleading message "Resetting to default..."
Steffen Prohaska
2007-10-18
mergetool: add support for ECMerge
Steffen Prohaska
2007-10-18
mergetool: use path to mergetool in config var mergetool.<tool>.path
Steffen Prohaska
2007-09-29
mergetool: Fix typo in options passed to kdiff3
Theodore Ts'o
2007-09-29
mergetool: fix emerge when running in a subdirectory
Theodore Ts'o
2007-09-29
Mergetool generating blank files (1.5.3)
Junio C Hamano
2007-09-24
Supplant the "while case ... break ;; esac" idiom
David Kastrup
[next]