org/kernel/git.git - forked from git/git

	Commit message (Expand)	Author	Age
*	Merge branch 'js/difftool-builtin'	Junio C Hamano	2017-01-31
\|\
\| *	difftool: retire the scripted version	Johannes Schindelin	2017-01-19
\| *	difftool: add a skeleton for the upcoming builtin	Johannes Schindelin	2017-01-17
* \|	difftool: fix dir-diff index creation when in a subdirectory	David Aguilar	2016-12-08
\|/
*	difftool: always honor fatal error exit codes	John Keeping	2016-08-15
*	Merge branch 'jk/difftool-in-subdir' into maint	Junio C Hamano	2016-08-12
\|\
\| *	difftool: avoid $GIT_DIR and $GIT_WORK_TREE	David Aguilar	2016-07-28
* \|	Merge branch 'ak/t7800-wo-readlink' into maint	Junio C Hamano	2016-07-11
\|\ \ \| \|/ \|/\|
\| *	t7800: readlink may not be available	Armin Kunaschik	2016-06-21
* \|	Merge branch 'da/difftool'	Junio C Hamano	2016-05-23
\|\ \
\| * \|	difftool: handle unmerged files in dir-diff mode	David Aguilar	2016-05-16
* \| \|	Merge branch 'nf/mergetool-prompt'	Junio C Hamano	2016-05-03
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	difftool/mergetool: make the form of yes/no questions consistent	Nikola Forró	2016-04-25
\| * \|	Merge branch 'jk/test-lint-forbid-when-finished-in-subshell' into maint	Junio C Hamano	2015-12-11
\| \|\ \
* \| \| \|	mingw: work around pwd issues in the tests	Johannes Schindelin	2016-01-28
* \| \| \|	Merge branch 'da/difftool'	Junio C Hamano	2015-11-03
\|\ \ \ \ \| \|/ / / \| \| / / \| \|/ / \|/\| \|
\| * \|	difftool: ignore symbolic links in use_wt_file	David Aguilar	2015-10-29
\| \|/
* \|	t7800: don't use test_config in a subshell	John Keeping	2015-09-08
\|/
*	difftool: honor --trust-exit-code for builtin tools	David Aguilar	2014-11-14
*	difftool: add support for --trust-exit-code	David Aguilar	2014-10-28
*	difftool--helper: exit when reading a prompt answer fails	Johannes Sixt	2014-10-27
*	run_external_diff: clean up error handling	Jeff King	2014-04-21
*	t7800: add a difftool test for .git-files	Junio C Hamano	2014-03-05
*	difftool --dir-diff: allow changing any clean working tree file	Kenichi Saita	2013-05-29
*	difftool: fix dir-diff when file does not exist in working tree	John Keeping	2013-05-17
*	t7800: run --dir-diff tests with and without symlinks	John Keeping	2013-03-29
*	t7800: fix tests when difftool uses --no-symlinks	John Keeping	2013-03-29
*	t7800: don't hide grep output	John Keeping	2013-03-29
*	difftool: don't overwrite modified files	John Keeping	2013-03-29
*	t7800: move '--symlinks' specific test to the end	John Keeping	2013-03-29
*	Merge branch 'jk/difftool-dir-diff-edit-fix'	Junio C Hamano	2013-03-28
\|\
\| *	difftool --dir-diff: symlink all files matching the working tree	John Keeping	2013-03-14
* \|	t7800: "defaults" is no longer a builtin tool name	David Aguilar	2013-02-21
* \|	t7800: modernize tests	David Aguilar	2013-02-20
* \|	t7800: update copyright notice	David Aguilar	2013-02-19
\|/
*	mergetool--lib: Allow custom commands to override built-ins	David Aguilar	2012-09-25
*	Merge branch 'th/difftool-diffall'	Junio C Hamano	2012-05-07
\|\
\| *	difftool: print list of valid tools with '--tool-help'	Tim Henigan	2012-04-23
\| *	difftool: teach difftool to handle directory diffs	Tim Henigan	2012-04-23
\| *	difftool: add '--no-gui' option	Tim Henigan	2012-03-23
* \|	t7800: Test difftool passing arguments to diff	David Aguilar	2012-03-19
\|/
*	t7800: avoid arithmetic expansion notation	Junio C Hamano	2011-10-14
*	git-difftool: allow skipping file by typing 'n' at prompt	Sitaram Chamarty	2011-10-10
*	test: consolidate definition of $LF	Junio C Hamano	2011-08-11
*	t7800 (difftool): add missing &&	Elijah Newren	2010-10-06
*	t/t7800-difftool.sh: Skip with prereq on no PERL	Ævar Arnfjörð Bjarmason	2010-08-18
*	tests: Skip tests in a way that makes sense under TAP	Ævar Arnfjörð Bjarmason	2010-06-25
*	difftool: Fix '--gui' when diff.guitool is unconfigured	David Aguilar	2010-03-28
*	t7800-difftool.sh: Test mergetool.prompt fallback	David Aguilar	2010-01-22
*	difftool: Update copyright notices to list each year separately	David Aguilar	2010-01-15