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
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
2007-07-03
Rewrite "git-frotz" to "git frotz"
Junio C Hamano
2007-06-10
git-mergetool: Make default selection of merge-tool more intelligent
Theodore Ts'o
2007-06-10
[PATCH] git-mergetool: Allow gvimdiff to be used as a mergetool
Dan McGee
2007-06-06
Fix typo in git-mergetool
Josh Triplett
2007-03-30
mergetool: Clean up description of files and prompts for merge resolutions
Theodore Ts'o
2007-03-29
mergetool: Make git-rm quiet when resolving a deleted file conflict
Theodore Ts'o
2007-03-29
mergetool: Add support for Apple Mac OS X's opendiff command
Theodore Ts'o
2007-03-29
mergetool: Fix abort command when resolving symlinks and deleted files
Theodore Ts'o
2007-03-29
mergetool: Remove spurious error message if merge.tool config option not set
Theodore Ts'o
2007-03-29
mergetool: factor out common code
Theodore Ts'o
2007-03-29
mergetool: portability fix: don't use reserved word function
Theodore Ts'o
2007-03-29
mergetool: portability fix: don't assume true is in /bin
Theodore Ts'o
2007-03-29
mergetool: Don't error out in the merge case where the local file is deleted
Theodore Ts'o
2007-03-29
mergetool: Replace use of "echo -n" with printf(1) to be more portable
Theodore Ts'o
2007-03-19
mergetool: print an appropriate warning if merge.tool is unknown
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
[prev]