git - git

	Commit message (Expand)	Author	Age	Files	Lines
*	strbuf: convert strbuf_add_unique_abbrev to use struct object_id	brian m. carlson	2018-03-14	1	-1/+1
*	tree: convert read_tree_recursive to struct object_id	brian m. carlson	2018-03-14	1	-1/+1
*	Merge branch 'po/object-id'	Junio C Hamano	2018-02-15	1	-2/+3
\|\
\| *	sha1_file: convert write_sha1_file to object_id	Patryk Obara	2018-01-30	1	-2/+3
* \|	Merge branch 'en/merge-recursive-fixes'	Junio C Hamano	2018-02-15	1	-1/+20
\|\ \ \| \|/ \|/\|
\| *	merge-recursive: add explanation for src_entry and dst_entry	Elijah Newren	2018-01-19	1	-0/+19
\| *	merge-recursive: fix logic ordering issue	Elijah Newren	2018-01-19	1	-1/+1
* \|	Merge branch 'jc/merge-symlink-ours-theirs'	Junio C Hamano	2018-01-23	1	-4/+13
\|\ \ \| \|/ \|/\|
\| *	merge: teach -Xours/-Xtheirs to symbolic link merge	Junio C Hamano	2018-01-03	1	-4/+13
* \|	Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with...	Junio C Hamano	2018-01-09	1	-1/+1
\|\ \
\| * \|	merge-recursive: do not look at the index during recursive merge	Junio C Hamano	2018-01-09	1	-1/+1
* \| \|	Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with...	Junio C Hamano	2017-12-22	1	-0/+7
\|\\| \|
\| * \|	merge-recursive: avoid incorporating uncommitted changes in a merge	Elijah Newren	2017-12-22	1	-0/+7
* \| \|	Merge branch 'en/merge-recursive-icase-removal'	Junio C Hamano	2017-12-19	1	-1/+1
\|\ \ \
\| * \| \|	merge-recursive: ignore_case shouldn't reject intentional removals	Elijah Newren	2017-11-27	1	-1/+1
* \| \| \|	Merge branch 'bc/hash-algo'	Junio C Hamano	2017-12-13	1	-1/+1
\|\ \ \ \
\| * \| \| \|	Switch empty tree and blob lookups to use hash abstraction	brian m. carlson	2017-11-13	1	-1/+1
* \| \| \| \|	Merge branch 'sb/test-cherry-pick-submodule-getting-in-a-way'	Junio C Hamano	2017-11-27	1	-2/+3
\|\ \ \ \ \ \| \| \|_\|/ / \| \|/\| \| \|
\| * \| \| \|	merge-recursive: handle addition of submodule on our side of history	Elijah Newren	2017-11-15	1	-2/+3
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge branch 'jc/ignore-cr-at-eol'	Junio C Hamano	2017-11-27	1	-0/+2
\|\ \ \ \
\| * \| \| \|	diff: --ignore-cr-at-eol	Junio C Hamano	2017-11-08	1	-0/+2
* \| \| \| \|	Merge branch 'ao/merge-verbosity-getenv-just-once'	Junio C Hamano	2017-11-15	1	-3/+4
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \|
\| * \| \| \|	merge-recursive: check GIT_MERGE_VERBOSITY only once	Andrey Okoshkin	2017-11-01	1	-3/+4
\| \|/ / /
* \| \| \|	Merge branch 'bw/diff-opt-impl-to-bitfields'	Junio C Hamano	2017-11-09	1	-2/+2
\|\ \ \ \
\| * \| \| \|	diff: make struct diff_flags members lowercase	Brandon Williams	2017-11-01	1	-2/+2
\| * \| \| \|	diff: remove DIFF_OPT_CLR macro	Brandon Williams	2017-11-01	1	-1/+1
\| * \| \| \|	diff: remove DIFF_OPT_SET macro	Brandon Williams	2017-11-01	1	-1/+1
\| \| \|/ / \| \|/\| \|
* / \| \|	treewide: prefer lockfiles on the stack	Martin Ågren	2017-10-06	1	-3/+3
\|/ / /
* \| \|	Merge branch 'kw/merge-recursive-cleanup'	Junio C Hamano	2017-09-19	1	-20/+56
\|\ \ \
\| * \| \|	merge-recursive: change current file dir string_lists to hashmap	Kevin Willford	2017-09-08	1	-11/+45
\| * \| \|	merge-recursive: remove return value from get_files_dirs	Kevin Willford	2017-09-06	1	-6/+2
\| * \| \|	merge-recursive: fix memory leak	Kevin Willford	2017-09-06	1	-3/+9
\| \| \|/ \| \|/\|
* / \|	treewide: correct several "up-to-date" to "up to date"	Martin Ågren	2017-08-23	1	-1/+1
\|/ /
* \|	Merge branch 'sb/merge-recursive-code-cleanup'	Junio C Hamano	2017-07-07	1	-3/+3
\|\\|
\| *	merge-recursive: use DIFF_XDL_SET macro	Stefan Beller	2017-06-30	1	-3/+3
* \|	Merge branch 'bw/config-h'	Junio C Hamano	2017-06-24	1	-0/+1
\|\ \
\| * \|	config: don't include config.h by default	Brandon Williams	2017-06-15	1	-0/+1
\| \|/
* \|	Merge branch 'bw/ls-files-sans-the-index'	Junio C Hamano	2017-06-24	1	-2/+2
\|\ \
\| * \|	convert: convert renormalize_buffer to take an index	Brandon Williams	2017-06-13	1	-2/+2
* \| \|	diff-tree: convert diff_tree_sha1 to struct object_id	Brandon Williams	2017-06-05	1	-1/+1
\|/ /
* \|	object: convert parse_object* to take struct object_id	brian m. carlson	2017-05-08	1	-1/+1
* \|	Convert lookup_tree to struct object_id	brian m. carlson	2017-05-08	1	-3/+3
* \|	submodule: convert merge_submodule to use struct object_id	brian m. carlson	2017-05-08	1	-4/+4
* \|	Convert struct cache_tree to use struct object_id	brian m. carlson	2017-05-02	1	-1/+1
\|/
*	Merge branch 'mm/merge-rename-delete-message'	Junio C Hamano	2017-02-27	1	-54/+63
\|\
\| *	merge-recursive: make "CONFLICT (rename/delete)" message show both paths	Matt McCutchen	2017-01-30	1	-54/+63
\| *	Merge branch 'nd/qsort-in-merge-recursive' into maint	Junio C Hamano	2017-01-18	1	-9/+7
\| \|\
\| * \	Merge branch 'jc/renormalize-merge-kill-safer-crlf' into maint	Junio C Hamano	2017-01-17	1	-0/+2
\| \|\ \
* \| \| \|	use SWAP macro	René Scharfe	2017-01-30	1	-4/+1
* \| \| \|	Merge branch 'jc/lock-report-on-error'	Junio C Hamano	2016-12-19	1	-1/+1
\|\ \ \ \