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

	Commit message (Expand)	Author	Age
*	Merge branch 'rh/diff-orderfile-doc'	Junio C Hamano	2017-01-23
\|\
\| *	diff: document the format of the -O (diff.orderFile) file	Richard Hansen	2017-01-15
\| *	diff: document behavior of relative diff.orderFile	Richard Hansen	2017-01-15
* \|	diff: add interhunk context config option	Vegard Nossum	2017-01-12
* \|	diff: retire "compaction" heuristics	Junio C Hamano	2016-12-23
\|/
*	Merge branch 'jc/ws-error-highlight'	Junio C Hamano	2016-10-26
\|\
\| *	diff: introduce diff.wsErrorHighlight option	Junio C Hamano	2016-10-04
* \|	Merge branch 'mh/diff-indent-heuristic'	Junio C Hamano	2016-09-26
\|\ \
\| * \|	diff: improve positioning of add/delete blocks in diffs	Michael Haggerty	2016-09-19
* \| \|	diff: teach diff to display submodule difference with an inline diff	Jacob Keller	2016-08-31
* \| \|	Merge branch 'mm/doc-tt'	Junio C Hamano	2016-07-13
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	doc: typeset short command-line options as literal	Matthieu Moy	2016-06-28
* \| \|	Merge branch 'tr/doc-tt'	Junio C Hamano	2016-06-27
\|\ \ \ \| \|/ /
\| * \|	doc: change configuration variables format	Tom Russello	2016-06-08
\| \|/
* \|	Merge branch 'jk/diff-compact-heuristic'	Junio C Hamano	2016-06-10
\|\ \
\| * \|	diff: disable compaction heuristic for now	Junio C Hamano	2016-06-10
\| * \|	diff: undocument the compaction heuristic knobs for experimentation	Junio C Hamano	2016-05-02
\| * \|	xdiff: implement empty line chunk heuristic	Stefan Beller	2016-04-19
\| \|/
* \|	diff: activate diff.renames by default	Matthieu Moy	2016-02-25
* \|	Documentation/diff-config: fix description of diff.renames	Matthieu Moy	2016-02-25
\|/
*	*config.txt: stick to camelCase naming convention	Nguyễn Thái Ngọc Duy	2015-03-13
*	Documentation: use "command-line" when used as a compound adjective, and fix ...	Jason St. John	2014-05-21
*	diff: add diff.orderfile configuration variable	Samuel Bronson	2013-12-18
*	Improve documentation concerning the status.submodulesummary setting	Jens Lehmann	2013-09-11
*	Merge branch 'mp/diff-algo-config'	Junio C Hamano	2013-02-17
\|\
\| *	config: Introduce diff.algorithm variable	Michal Privoznik	2013-01-16
* \|	Merge branch 'da/mergetool-docs'	Junio C Hamano	2013-02-07
\|\ \
\| * \|	doc: generate a list of valid merge tools	David Aguilar	2013-02-02
* \| \|	Documentation: the name of the system is 'Git', not 'git'	Thomas Ackermann	2013-02-01
\| \|/ \|/\|
* \|	Documentation/diff-config: work around AsciiDoc misfortune	Junio C Hamano	2012-12-07
* \|	diff: introduce diff.submodule configuration variable	Ramkumar Ramachandra	2012-11-18
* \|	Documentation: move diff.wordRegex from config.txt to diff-config.txt	Ramkumar Ramachandra	2012-11-18
* \|	diff: diff.context configuration gives default to -U	Jeff Muizelaar	2012-09-30
\|/
*	Documentation: spelling fixes	Miklos Vajna	2012-06-19
*	diff --stat: add config option to limit graph width	Zbigniew Jędrzejewski-Szmek	2012-03-01
*	New --dirstat=lines mode, doing dirstat analysis based on diffstat	Johan Herland	2011-04-29
*	Add config variable for specifying default --dirstat behavior	Johan Herland	2011-04-29
*	Documentation: Allow custom diff tools to be specified in 'diff.tool'	Ramkumar Ramachandra	2011-04-06
*	Documentation: Add diff.<driver>.* to config	Ramkumar Ramachandra	2011-04-06
*	Documentation: Move diff.<driver>.* from config.txt to diff-config.txt	Ramkumar Ramachandra	2011-04-06