delta/git.git - github.com: git/git.git

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'da/mergetool-custom'	Junio C Hamano	2012-10-01	1	-0/+13
\|\
\| *	mergetool--lib: Allow custom commands to override built-ins	David Aguilar	2012-09-25	1	-0/+13
* \|	stash: invoke rerere in case of conflict	Phil Hord	2012-08-17	1	-1/+1
* \|	test: git-stash conflict sets up rerere	Phil Hord	2012-08-17	1	-0/+38
\|/
*	mergetool: Provide an empty file when neededda/maint-mergetool-twoway	David Aguilar	2012-01-23	1	-1/+27
*	mergetool: Use args as pathspec to unmerged files	Jonathon Mah	2011-09-26	1	-18/+40
*	mergetool: Teach about submodules	Jonathon Mah	2011-04-13	1	-3/+287
*	mergetool: don't skip modify/remove conflicts	Martin von Zweigbergk	2011-02-16	1	-6/+34
*	tests: add missing &&	Jonathan Nieder	2010-11-09	1	-1/+1
*	t7610: cd inside subshell instead of around	Brian Gernhardt	2010-08-24	1	-23/+26
*	mergetool: Skip autoresolved paths	David Aguilar	2010-08-17	1	-12/+34
*	mergetool: fix running mergetool in sub-directories	Charles Bailey	2009-01-31	1	-1/+1
*	mergetool: Add a test for running mergetool in a sub-directory	Charles Bailey	2009-01-31	1	-19/+51
*	mergetool: respect autocrlf by using checkout-index	Charles Bailey	2009-01-27	1	-2/+13
*	tests: use "git xyzzy" form (t7200 - t9001)	Nanako Shiraishi	2008-09-03	1	-1/+1
*	t/: Use "test_must_fail git" instead of "! git"	Stephan Beyer	2008-07-13	1	-1/+1
*	Fix executable bits in t/ scripts	Junio C Hamano	2008-07-04	1	-0/+0
*	Add a very basic test script for git mergetool	Charles Bailey	2008-03-05	1	-0/+46