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: add interhunk context config option	Vegard Nossum	2017-01-12
\|/
*	Merge branch 'nd/ita-empty-commit'	Junio C Hamano	2016-10-27
\|\
\| *	diff: add --ita-[in]visible-in-index	Nguyễn Thái Ngọc Duy	2016-10-24
* \|	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
\|\ \
\| * \|	blame: honor the diff heuristic options and config	Michael Haggerty	2016-09-19
\| * \|	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
* \| \|	graph: add support for --line-prefix on all graph-aware output	Jacob Keller	2016-08-31
* \| \|	Merge branch 'jc/doc-diff-filter-exclude'	Junio C Hamano	2016-07-25
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	diff: document diff-filter exclusion	Junio C Hamano	2016-07-14
* \| \|	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
\| \|/ /
* \| \|	Documentation: fix linkgit references	Junio C Hamano	2016-05-09
* \| \|	Merge branch 'es/format-patch-doc-hide-no-patch' into maint	Junio C Hamano	2016-05-02
\|\ \ \
\| * \| \|	git-format-patch.txt: don't show -s as shorthand for multiple options	Eric Sunshine	2016-04-04
\| \|/ /
\| * \|	Merge branch 'mm/log-format-raw-doc' into maint	Junio C Hamano	2015-06-16
\| \|\ \
\| * \ \	Merge branch 'jk/asciidoc-markup-fix' into maint	Junio C Hamano	2015-06-05
\| \|\ \ \
* \| \| \| \|	Documentation: git diff --check detects conflict markers	Ori Avtalion	2016-03-29
\| \|_\|_\|/ \|/\| \| \|
* \| \| \|	Documentation/diff: give --word-diff-regex=. example	Michael J Gruber	2015-11-24
* \| \| \|	Merge branch 'jc/diff-ws-error-highlight'	Junio C Hamano	2015-06-11
\|\ \ \ \
\| * \| \| \|	diff.c: --ws-error-highlight=<kind> option	Junio C Hamano	2015-05-26
* \| \| \| \|	Merge branch 'mm/log-format-raw-doc'	Junio C Hamano	2015-06-01
\|\ \ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \|
\| * \| \| \|	Documentation/log: clarify what --raw means	Matthieu Moy	2015-05-18
\| \|/ / /
* \| \| \|	Merge branch 'jk/asciidoc-markup-fix'	Junio C Hamano	2015-05-22
\|\ \ \ \ \| \|_\|/ / \|/\| \| / \| \| \|/ \| \|/\|
\| * \|	doc: convert AsciiDoc {?foo} to ifdef::foo[]	Jeff King	2015-05-14
\| \|/
* \|	*config.txt: stick to camelCase naming convention	Nguyễn Thái Ngọc Duy	2015-03-13
\|/
*	Documentation: fix misuses of "nor"	Justin Lebar	2014-03-31
*	diff: add diff.orderfile configuration variable	Samuel Bronson	2013-12-18
*	Merge branch 'mm/diff-no-patch-synonym-to-s'	Junio C Hamano	2013-07-22
\|\
\| *	Documentation: move description of -s, --no-patch to diff-options.txt	Matthieu Moy	2013-07-17
* \|	Merge branch 'ft/diff-rename-default-score-is-half'	Junio C Hamano	2013-07-12
\|\ \
\| * \|	diff-options: document default similarity index	Fraser Tweedale	2013-07-05
* \| \|	Merge branch 'ap/diff-ignore-blank-lines'	Junio C Hamano	2013-06-30
\|\ \ \
\| * \| \|	diff: add --ignore-blank-lines option	Antoine Pelisse	2013-06-19
\| \| \|/ \| \|/\|
* \| \|	Merge branch 'rr/diffcore-pickaxe-doc'	Junio C Hamano	2013-06-11
\|\ \ \
\| * \| \|	diffcore-pickaxe doc: document -S and -G properly	Ramkumar Ramachandra	2013-06-03
\| \|/ /
\| * \|	Merge branch 'jc/color-diff-doc'	Junio C Hamano	2013-03-19
\| \|\ \
* \| \| \|	trivial: Add missing period in documentation	Phil Hord	2013-05-28
* \| \| \|	Merge branch 'maint-1.8.1' into maint	Junio C Hamano	2013-03-25
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Merge branch 'jc/color-diff-doc' into maint-1.8.1	Junio C Hamano	2013-03-25
\| \|\ \ \ \| \| \|/ / \| \| \| / \| \| \|/ \| \|/\|
\| \| *	diff-options: unconfuse description of --color	Junio C Hamano	2013-02-22
* \| \|	Merge branch 'mp/diff-algo-config'	Junio C Hamano	2013-02-17
\|\ \ \
\| * \| \|	diff: Introduce --diff-algorithm command line option	Michal Privoznik	2013-01-16
\| \|/ /
* \| \|	Documentation: the name of the system is 'Git', not 'git'	Thomas Ackermann	2013-02-01
\|/ /