This project is a fork of the git.git project. If you have that one already cloned locally, you can use
git clone --reference /path/to/your/git.git/incarnation mirror_URL
to save bandwidth during cloning.
 
descriptionGit mergetool
ownertytso@mit.edu
last changeSat, 29 Sep 2007 02:26:05 +0000
Content tags:
Add:
readme
git-mergetool automates the resolution of merge conflicts by calling out to graphical merge tools such as kdiff3, tkdiff, meld, xxdiff, etc.
shortlog
2007-09-29 Theodore Ts'omergetool: Fix typo in options passed to kdiff3mastermergetool
2007-09-29 Theodore Ts'omergetool: fix emerge when running in a subdirectory
2007-09-29 Junio C HamanoMergetool generating blank files (1.5.3)
2007-09-26 Johannes Schindelinapply: get rid of --index-info in favor of --build...
2007-09-26 Carlos RicaMove make_cache_entry() from merge-recursive.c into...
2007-09-26 Randy Dunlapcore-tutorial: correct URL
2007-09-26 Shawn BohrerFix spelling of overridden in documentation
2007-09-26 Johannes Sixtgitattributes.txt: Be more to the point in the filter...
2007-09-26 Johannes Sixtgitattributes.txt: Remove a duplicated paragraph about...
2007-09-26 Michael Smithuser-manual: Explain what submodules are good for.
2007-09-25 Junio C HamanoMerge branch 'jn/web' into maint
2007-09-25 Jim MeyeringDo not over-quote the -f envelopesender value.
2007-09-25 Jim Meyeringunexpected Make output (e.g. from --debug) causes build...
2007-09-25 Glenn RempeFixed minor typo in t/t9001-send-email.sh test command...
2007-09-24 Jakub Narebskigitweb: No difftree output for trivial merge
2007-09-24 Jakub Narebskigitweb: Remove parse_from_to_diffinfo code from git_pat...
...
heads
7 years ago master
7 years ago mergetool