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
/
Documentation
/
git-mergetool.txt
Age
Commit message (
Expand
)
Author
2014-04-24
mergetool: document the default for --[no-]prompt
Junio C Hamano
2013-05-17
documentation: trivial style cleanups
Felipe Contreras
2012-08-27
Merge branch 'da/difftool-updates'
Junio C Hamano
2012-08-10
mergetool,difftool: Document --tool-help consistently
David Aguilar
2012-07-24
mergetool: support --tool-help option like difftool does
Junio C Hamano
2011-10-11
Merge branch 'jm/mergetool-pathspec'
Junio C Hamano
2011-09-26
mergetool: Use args as pathspec to unmerged files
Jonathon Mah
2011-07-07
Documentation: use [verse] for SYNOPSIS sections
Martin von Zweigbergk
2011-03-20
Merge branch 'ss/mergetool--lib'
Junio C Hamano
2011-03-11
doc: drop author/documentation sections from most pages
Jeff King
2011-02-28
mergetool--lib: Add Beyond Compare 3 as a tool
Sebastian Schuberth
2011-02-28
mergetool--lib: Sort tools alphabetically for easier lookup
Sebastian Schuberth
2010-10-08
Use parentheses and `...' where appropriate
Štěpán Němec
2010-07-19
Documentation: Explain git-mergetool's use of temporary files
David Aguilar
2010-01-10
Documentation: spell 'git cmd' without dash throughout
Thomas Rast
2009-10-29
mergetool--lib: add p4merge as a pre-configured mergetool option
Scott Chacon
2009-05-24
mergetool--lib: add support for araxis merge
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-01-18
Documentation: let asciidoc align related options
Markus Heidelberg
2009-01-01
Merge branch 'cb/mergetool'
Junio C Hamano
2008-12-10
Improve language in git-merge.txt and related docs
Ralf Wildenhues
2008-11-15
Add -y/--no-prompt option to mergetool
Charles Bailey
2008-08-06
Documentation: typos / spelling fixes
Mike Ralphson
2008-07-05
manpages: italicize git command names (which were in teletype font)
Jonathan Nieder
2008-07-02
Documentation formatting and cleanup
Jonathan Nieder
2008-07-02
Documentation: be consistent about "git-" versus "git "
Jonathan Nieder
2008-06-06
documentation: move git(7) to git(1)
Christian Couder
2008-03-09
merge-tool documentation: describe custom command usage
Charles Bailey
2008-03-09
git-mergetool documentaiton: show toolnames in typewriter font
Charles Bailey
2008-01-07
Documentation: rename gitlink macro to linkgit
Dan McGee
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-06-10
[PATCH] git-mergetool: Allow gvimdiff to be used as a mergetool
Dan McGee
2007-06-07
War on whitespace
Junio C Hamano
2007-05-04
Document 'opendiff' value in config.txt and git-mergetool.txt
Arjen Laarhoven
2007-03-29
Fix minor formatting issue in man page for git-mergetool
Theodore Ts'o
2007-03-19
mergetool: Add support for vimdiff.
James Bowes
2007-03-14
Add git-mergetool to run an appropriate merge conflict resolution program
Theodore Ts'o