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

	Commit message (Expand)	Author	Age
*	Merge branch 'da/difftool'	Junio C Hamano	2014-10-29
\|\
\| *	difftool: add support for --trust-exit-code	David Aguilar	2014-10-28
* \|	difftool: don't assume that default sh is sane	Charles Bailey	2014-10-15
\|/
*	difftool: support repositories with .git-files	David Aguilar	2014-02-24
*	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
*	difftool: don't overwrite modified files	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
\| *	difftool: avoid double slashes in symlink targets	John Keeping	2013-03-14
* \|	difftool: silence uninitialized variable warning	David Aguilar	2013-02-17
\|/
*	git-difftool: use git-mergetool--lib for "--tool-help"	John Keeping	2013-01-25
*	difftool: silence warning	Ross Lagerwall	2012-08-21
*	difftool: Disable --symlinks on cygwin	David Aguilar	2012-07-26
*	difftool: Handle compare() returning -1	David Aguilar	2012-07-26
*	difftool: Wrap long lines for readability	David Aguilar	2012-07-26
*	difftool: Check all return codes from compare()	David Aguilar	2012-07-25
*	difftool: Handle finding mergetools/ in a path with spaces	David Aguilar	2012-07-25
*	difftool: Use symlinks when diffing against the worktree	David Aguilar	2012-07-23
*	difftool: Call the temp directory "git-difftool"	David Aguilar	2012-07-22
*	difftool: Move option values into a hash	David Aguilar	2012-07-22
*	difftool: Eliminate global variables	David Aguilar	2012-07-22
*	difftool: Simplify print_tool_help()	David Aguilar	2012-07-22
*	difftool: only copy back files modified during directory diff	Tim Henigan	2012-07-19
*	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: eliminate setup_environment function	Tim Henigan	2012-03-23
*	difftool: stop appending '.exe' to git	Tim Henigan	2012-03-23
*	difftool: remove explicit change of PATH	Tim Henigan	2012-03-23
*	difftool: exit(0) when usage is printed	Tim Henigan	2012-03-23
*	difftool: add '--no-gui' option	Tim Henigan	2012-03-23
*	difftool: parse options using Getopt::Long	Tim Henigan	2012-03-23
*	use -h for synopsis and --help for manpage consistently	Clemens Buchacher	2011-10-05
*	difftool: Fix failure on Cygwin	Ramsay Jones	2010-12-14
*	perl: bump the required Perl version to 5.8 from 5.6.[21]	Ævar Arnfjörð Bjarmason	2010-09-27
*	difftool: Fix '--gui' when diff.guitool is unconfigured	David Aguilar	2010-03-28
*	difftool: Add '-x' and as an alias for '--extcmd'	David Aguilar	2010-01-15
*	difftool: Allow specifying unconfigured commands with --extcmd	David Aguilar	2010-01-09
*	git-difftool: Add '--gui' for selecting a GUI tool	David Aguilar	2010-01-03
*	Explain seemingly pointless use of system in difftool	Alex Riesen	2009-04-24
*	Wait for git diff to finish in git difftool	Alex Riesen	2009-04-22
*	difftool: add support for a difftool.prompt config variable	David Aguilar	2009-04-07
*	difftool: move 'git-difftool' out of contrib	David Aguilar	2009-04-07