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

	Commit message (Expand)	Author	Age
*	Merge branch 'jk/diff-submodule-diff-inline'	Junio C Hamano	2016-09-12
\|\
\| *	diff: teach diff to display submodule difference with an inline diff	Jacob Keller	2016-08-31
\| *	diff: prepare for additional submodule formats	Jacob Keller	2016-08-31
\| *	graph: add support for --line-prefix on all graph-aware output	Jacob Keller	2016-08-31
\| *	diff.c: remove output_prefix_length field	Junio C Hamano	2016-08-31
* \|	patch-ids: add flag to create the diff patch id using header only data	Kevin Willford	2016-07-29
\|/
*	Merge branch 'mm/diff-renames-default'	Junio C Hamano	2016-04-03
\|\
\| *	diff: activate diff.renames by default	Matthieu Moy	2016-02-25
* \|	Merge branch 'jk/tighten-alloc'	Junio C Hamano	2016-02-26
\|\ \
\| * \|	tree-diff: catch integer overflow in combine_diff_path allocation	Jeff King	2016-02-19
\| * \|	Merge branch 'nd/diff-with-path-params' into maint	Junio C Hamano	2016-02-05
\| \|\ \
* \| \ \	Merge branch 'jk/more-comments-on-textconv'	Junio C Hamano	2016-02-26
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|
\| * \| \|	diff: clarify textconv interface	Jeff King	2016-02-22
* \| \| \|	Merge branch 'nd/diff-with-path-params'	Junio C Hamano	2016-02-03
\|\ \ \ \ \| \|_\|/ / \|/\| \| / \| \| \|/ \| \|/\|
\| * \|	diff: make -O and --output work in subdirectory	Duy Nguyen	2016-01-21
\| * \|	diff-no-index: do not take a redundant prefix argument	Nguyễn Thái Ngọc Duy	2016-01-21
* \| \|	avoid shifting signed integers 31 bits	Jeff King	2016-01-04
\|/ /
* \|	log: add "log.follow" configuration variable	David Turner	2015-07-09
* \|	Merge branch 'jk/color-diff-plain-is-context'	Junio C Hamano	2015-06-11
\|\ \ \| \|/
\| *	diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXT	Jeff King	2015-05-27
* \|	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
\| \|/
* \|	diff: convert struct combine_diff_path to object_id	brian m. carlson	2015-03-13
\|/
*	Merge branch 'ks/tree-diff-nway'	Junio C Hamano	2014-06-03
\|\
\| *	tree-diff: rework diff_tree() to generate diffs for multiparent cases as well	Kirill Smelkov	2014-04-07
\| *	tree-diff: diff_tree() should now be static	Kirill Smelkov	2014-03-26
* \|	Merge branch 'jc/hold-diff-remove-q-synonym-for-no-deletion'	Junio C Hamano	2014-03-07
\|\ \ \| \|/ \|/\|
\| *	diff: remove "diff-files -q" in a version of Git in a distant future	Junio C Hamano	2013-07-19
* \|	combine-diff: combine_diff_path.len is not needed anymore	Kirill Smelkov	2014-02-24
* \|	Merge branch 'tg/diff-no-index-refactor'	Junio C Hamano	2013-12-27
\|\ \
\| * \|	diff: move no-index detection to builtin/diff.c	Thomas Gummerer	2013-12-12
* \| \|	Merge branch 'zk/difftool-counts'	Junio C Hamano	2013-12-27
\|\ \ \
\| * \| \|	difftool: display the number of files in the diff queue in the prompt	Zoltan Klinger	2013-12-06
\| \|/ /
* \| \|	Use the word 'stuck' instead of 'sticked'	Nicolas Vigier	2013-10-31
\|/ /
* \|	Merge branch 'mg/more-textconv'	Junio C Hamano	2013-10-23
\|\ \
\| * \|	diff_opt: track whether flags have been set explicitly	Junio C Hamano	2013-05-10
* \| \|	Merge branch 'jl/submodule-mv'	Junio C Hamano	2013-09-09
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	remove diff_tree_{setup,release}_paths	Nguyễn Thái Ngọc Duy	2013-07-15
\| * \|	move struct pathspec and related functions to pathspec.[ch]	Nguyễn Thái Ngọc Duy	2013-07-15
\| \|/
* \|	diff: deprecate -q option to diff-files	Junio C Hamano	2013-07-19
* \|	diff: preparse --diff-filter string argument	Junio C Hamano	2013-07-17
\|/
*	Merge branch 'mp/diff-algo-config'	Junio C Hamano	2013-02-17
\|\
\| *	diff: Introduce --diff-algorithm command line option	Michal Privoznik	2013-01-16
* \|	diff: add diff_line_prefix function	John Keeping	2013-02-12
\|/
*	Move setup_diff_pager to libgit.a	Nguyễn Thái Ngọc Duy	2012-10-29
*	diff.c: mark a private file-scope symbol as static	Junio C Hamano	2012-09-15
*	Merge branch 'jk/maint-null-in-trees'	Junio C Hamano	2012-08-27
\|\
\| *	diff: do not use null sha1 as a sentinel value	Jeff King	2012-07-29
* \|	Merge branch 'tr/void-diff-setup-done'	Junio C Hamano	2012-08-22
\|\ \
\| * \|	diff_setup_done(): return void	Thomas Rast	2012-08-03
\| \|/