Public Git Hosting - git/mergetool.git/summary

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.

description	Git mergetool
owner	tytso@mit.edu
last change	Sat, 29 Sep 2007 02:26:05 +0000 (28 22:26 -0400)
URL	git://repo.or.cz/git/mergetool.git
	https://repo.or.cz/git/mergetool.git
push URL	ssh://repo.or.cz/git/mergetool.git
	https://repo.or.cz/git/mergetool.git ^{(learn more)}
bundle info	mergetool.git downloadable bundles
content tags add:	git

readme

git-mergetool automates the resolution of merge conflicts by calling out to graphical merge tools such as kdiff3, tkdiff, meld, xxdiff, etc.

2007-09-29	Theodore Ts'o	mergetool: Fix typo in options passed to kdiff3mastermergetool	commit \| commitdiff \| tree \| snapshot (tar.gz zip)
2007-09-29	Theodore Ts'o	mergetool: fix emerge when running in a subdirectory	commit \| commitdiff \| tree \| snapshot (tar.gz zip)
2007-09-29	Junio C Hamano	Mergetool generating blank files (1.5.3)	commit \| commitdiff \| tree \| snapshot (tar.gz zip)
2007-09-26	Johannes Schindelin	apply: get rid of --index-info in favor of --build...	commit \| commitdiff \| tree \| snapshot (tar.gz zip)
2007-09-26	Carlos Rica	Move make_cache_entry() from merge-recursive.c into...	commit \| commitdiff \| tree \| snapshot (tar.gz zip)
2007-09-26	Randy Dunlap	core-tutorial: correct URL	commit \| commitdiff \| tree \| snapshot (tar.gz zip)
2007-09-26	Shawn Bohrer	Fix spelling of overridden in documentation	commit \| commitdiff \| tree \| snapshot (tar.gz zip)
2007-09-26	Johannes Sixt	gitattributes.txt: Be more to the point in the filter...	commit \| commitdiff \| tree \| snapshot (tar.gz zip)
2007-09-26	Johannes Sixt	gitattributes.txt: Remove a duplicated paragraph about...	commit \| commitdiff \| tree \| snapshot (tar.gz zip)
2007-09-26	Michael Smith	user-manual: Explain what submodules are good for.	commit \| commitdiff \| tree \| snapshot (tar.gz zip)
2007-09-25	Junio C Hamano	Merge branch 'jn/web' into maint	commit \| commitdiff \| tree \| snapshot (tar.gz zip)
2007-09-25	Jim Meyering	Do not over-quote the -f envelopesender value.	commit \| commitdiff \| tree \| snapshot (tar.gz zip)
2007-09-25	Jim Meyering	unexpected Make output (e.g. from --debug) causes build...	commit \| commitdiff \| tree \| snapshot (tar.gz zip)
2007-09-25	Glenn Rempe	Fixed minor typo in t/t9001-send-email.sh test command...	commit \| commitdiff \| tree \| snapshot (tar.gz zip)
2007-09-24	Jakub Narebski	gitweb: No difftree output for trivial merge	commit \| commitdiff \| tree \| snapshot (tar.gz zip)
2007-09-24	Jakub Narebski	gitweb: Remove parse_from_to_diffinfo code from git_pat...	commit \| commitdiff \| tree \| snapshot (tar.gz zip)
...

16 years ago	mergetool	log \| tree
16 years ago	master	log \| tree

Git mergetool

RSS Atom