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

	Commit message (Expand)	Author	Age
*	Merge branch 'bw/object-id'	Junio C Hamano	2017-06-19
\|\
\| *	tree-diff: convert diff_tree_paths to struct object_id	Brandon Williams	2017-06-05
\| *	diff-tree: convert diff_tree_sha1 to struct object_id	Brandon Williams	2017-06-05
\| *	tree-diff: convert diff_root_tree_sha1 to struct object_id	Brandon Williams	2017-06-02
\| *	combine-diff: convert diff_tree_combined to struct object_id	Brandon Williams	2017-06-02
\| *	diff: convert diff_flush_patch_id to struct object_id	Brandon Williams	2017-06-02
\| *	diff: convert diff_change to struct object_id	Brandon Williams	2017-06-02
\| *	diff: convert diff_addremove to struct object_id	Brandon Williams	2017-06-02
* \|	Merge branch 'js/blame-lib'	Junio C Hamano	2017-06-05
\|\ \ \| \|/ \|/\|
\| *	blame: move textconv_object with related functions	Jeff Smith	2017-05-24
* \|	diff-lib: convert do_diff_cache to struct object_id	brian m. carlson	2017-05-08
\|/
*	Rename sha1_array to oid_array	brian m. carlson	2017-03-31
*	Merge branch 'nd/ita-empty-commit'	Junio C Hamano	2016-10-27
\|\
\| *	commit: fix empty commit creation when there's no changes but ita entries	Nguyễn Thái Ngọc Duy	2016-10-24
\| *	diff-lib: allow ita entries treated as "not yet exist in index"	Nguyễn Thái Ngọc Duy	2016-10-24
* \|	diff_aligned_abbrev: use "struct oid"	Jeff King	2016-10-26
* \|	diff_unique_abbrev: rename to diff_aligned_abbrev	Jeff King	2016-10-26
\|/
*	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
* \|	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