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

	Commit message (Expand)	Author	Age
*	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
* \|	mergetools: create mergetool_find_win32_cmd() helper function for winmerge	Jacob Nisnevich	2016-04-04
\|/
*	mergetool-lib: fix default tool selection	Michael J Gruber	2015-06-19
*	mergetool--lib: set IFS for difftool and mergetool	David Aguilar	2015-05-20
*	mergetool--lib: remove use of $status global	David Aguilar	2014-11-21
*	mergetool--lib: remove no-op assignment to $status from setup_user_tool	Junio C Hamano	2014-11-21
*	Merge branch 'da/difftool'	Junio C Hamano	2014-11-18
\|\
\| *	difftool: honor --trust-exit-code for builtin tools	David Aguilar	2014-11-14
* \|	mergetool: rename bc3 to bc	Junio C Hamano	2014-10-21
\|/
*	remove #!interpreter line from shell libraries	Jonathan Nieder	2013-11-26
*	mergetool--lib: Fix typo in the merge/difftool help	Stefan Saasen	2013-10-14
*	mergetools/diffmerge: support DiffMerge as a git mergetool	Stefan Saasen	2013-10-13
*	many small typofixes	Ondřej Bílka	2013-07-29
*	mergetool--lib: refactor {diff,merge}_cmd logic	John Keeping	2013-06-17
*	doc: generate a list of valid merge tools	David Aguilar	2013-02-02
*	mergetool--lib: list user configured tools in '--tool-help'	John Keeping	2013-02-02
*	mergetool--lib: add functions for finding available tools	David Aguilar	2013-02-02
*	mergetool--lib: improve the help text in guess_merge_tool()	David Aguilar	2013-01-29
*	mergetool--lib: simplify command expressions	David Aguilar	2013-01-29
*	mergetools: simplify how we handle "vim" and "defaults"	David Aguilar	2013-01-28
*	mergetool--lib: don't call "exit" in setup_tool	John Keeping	2013-01-27
*	mergetool--lib: improve show_tool_help() output	David Aguilar	2013-01-27
*	git-mergetool: don't hardcode 'mergetool' in show_tool_help	John Keeping	2013-01-25
*	git-mergetool: remove redundant assignment	John Keeping	2013-01-25
*	git-mergetool: move show_tool_help to mergetool--lib	John Keeping	2013-01-25
*	Merge branch 'da/mergetool-custom'	Junio C Hamano	2012-10-01
\|\
\| *	mergetool--lib: Allow custom commands to override built-ins	David Aguilar	2012-09-25
* \|	Merge branch 'da/difftool-updates'	Junio C Hamano	2012-08-27
\|\ \ \| \|/ \|/\|
\| *	Add Code Compare v2.80.4 as a merge / diff tool for Windows	Sebastian Schuberth	2012-08-10
* \|	mergetool: support --tool-help option like difftool does	Junio C Hamano	2012-07-23
\|/
*	Merge branch 'maint'	Junio C Hamano	2011-09-19
\|\
\| *	git-mergetool: check return value from read	Jay Soffian	2011-09-19
* \|	mergetool--lib: Refactor tools into separate files	David Aguilar	2011-08-19
* \|	mergetool--lib: Make style consistent with git	David Aguilar	2011-08-19
* \|	misc-sh: fix up whitespace in some other .sh files.	Jon Seymour	2011-08-05
* \|	Merge branch 'da/git-prefix-everywhere' into next	Junio C Hamano	2011-06-29
\|\ \ \| \|/ \|/\|
\| *	git-mergetool--lib: Make vimdiff retain the current directory	David Aguilar	2011-05-26
* \|	Pass empty file to p4merge where no base is suitable.	Ciaran Jessup	2011-05-01
\|/
*	Merge branch 'ss/mergetool--lib'	Junio C Hamano	2011-03-19
\|\
\| *	mergetool--lib: Add Beyond Compare 3 as a tool	Sebastian Schuberth	2011-02-28
\| *	mergetool--lib: Sort tools alphabetically for easier lookup	Sebastian Schuberth	2011-02-28
* \|	mergetool-lib: call vim in readonly mode for diffs	Michael J Gruber	2011-02-25
\|/
*	mergetool-lib: make the three-way diff the default for vim/gvim	Dan McGee	2010-09-29
*	mergetool-lib: add a three-way diff view for vim/gvim	Dan McGee	2010-09-15
*	mergetool-lib: combine vimdiff and gvimdiff run blocks	Dan McGee	2010-09-15
*	mergetool: Remove explicit references to /dev/tty	Charles Bailey	2010-08-20
*	add shebang line to git-mergetool--lib.sh	Jeff King	2010-01-29
*	Merge branch 'rs/work-around-grep-opt-insanity'	Junio C Hamano	2009-11-25
\|\
\| *	mergetool--lib: simplify guess_merge_tool()	René Scharfe	2009-11-23