git - git

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'en/merge-recursive-skip-fix'	Junio C Hamano	2018-08-16	1	-0/+16
\|\
\| *	merge-recursive: preserve skip_worktree bit when necessary	Elijah Newren	2018-07-27	1	-0/+16
* \|	Merge branch 'en/dirty-merge-fixes'	Junio C Hamano	2018-08-03	1	-7/+7
\|\ \
\| * \|	merge-recursive: enforce rule that index matches head before merging	Elijah Newren	2018-07-11	1	-7/+7
\| * \|	merge-recursive: fix assumption that head tree being merged is HEAD	Elijah Newren	2018-07-11	1	-1/+1
\| * \|	merge-recursive: make sure when we say we abort that we actually abort	Elijah Newren	2018-07-11	1	-2/+2
\| * \|	index_has_changes(): avoid assuming operating on the_index	Elijah Newren	2018-07-03	1	-1/+1
* \| \|	Merge branch 'jm/cache-entry-from-mem-pool'	Junio C Hamano	2018-08-03	1	-2/+2
\|\ \ \
\| * \| \|	block alloc: add lifecycle APIs for cache_entry structs	Jameson Miller	2018-07-03	1	-1/+1
\| * \| \|	read-cache: teach make_cache_entry to take object_id	Jameson Miller	2018-07-03	1	-1/+1
\| * \| \|	read-cache: teach refresh_cache_entry to take istate	Jameson Miller	2018-07-03	1	-1/+1
\| \| \|/ \| \|/\|
* \| \|	Merge branch 'sb/object-store-lookup'	Junio C Hamano	2018-08-03	1	-7/+10
\|\ \ \
\| * \| \|	tag: add repository argument to deref_tag	Stefan Beller	2018-06-29	1	-1/+2
\| * \| \|	commit: add repository argument to lookup_commit_reference	Stefan Beller	2018-06-29	1	-3/+3
\| * \| \|	tree: add repository argument to lookup_tree	Stefan Beller	2018-06-29	1	-3/+3
\| * \| \|	object: add repository argument to parse_object	Stefan Beller	2018-06-29	1	-1/+3
\| * \| \|	Merge branch 'sb/object-store-grafts' into sb/object-store-lookup	Junio C Hamano	2018-06-29	1	-0/+1
\| \|\ \ \
* \| \ \ \	Merge branch 'sb/object-store-grafts'	Junio C Hamano	2018-07-18	1	-0/+1
\|\ \ \ \ \ \| \| \|/ / / \| \|/\| \| \|
\| * \| \| \|	object-store: move object access functions to object-store.h	Stefan Beller	2018-05-16	1	-0/+1
* \| \| \| \|	Merge branch 'en/merge-recursive-cleanup'	Junio C Hamano	2018-07-18	1	-82/+104
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|
\| * \| \| \|	merge-recursive: add pointer about unduly complex looking code	Elijah Newren	2018-06-12	1	-0/+15
\| * \| \| \|	merge-recursive: rename conflict_rename_*() family of functions	Elijah Newren	2018-06-12	1	-43/+43
\| * \| \| \|	merge-recursive: clarify the rename_dir/RENAME_DIR meaning	Elijah Newren	2018-06-12	1	-11/+17
\| * \| \| \|	merge-recursive: align labels with their respective code blocks	Elijah Newren	2018-06-12	1	-3/+3
\| * \| \| \|	merge-recursive: fix numerous argument alignment issues	Elijah Newren	2018-06-12	1	-37/+38
\| * \| \| \|	merge-recursive: fix miscellaneous grammar error in comment	Elijah Newren	2018-06-12	1	-1/+1
* \| \| \| \|	Merge branch 'sb/object-store-alloc'	Junio C Hamano	2018-06-25	1	-1/+2
\|\ \ \ \ \ \| \| \|/ / / \| \|/\| \| \|
\| * \| \| \|	alloc: allow arbitrary repositories for alloc functions	Stefan Beller	2018-05-16	1	-0/+1
\| * \| \| \|	alloc: add repository argument to alloc_commit_node	Stefan Beller	2018-05-09	1	-1/+1
* \| \| \| \|	Merge branch 'nd/commit-util-to-slab'	Junio C Hamano	2018-06-25	1	-3/+5
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \|
\| * \| \| \|	merge: use commit-slab in merge remote desc instead of commit->util	Nguyễn Thái Ngọc Duy	2018-05-21	1	-3/+5
\| \|/ / /
* \| \| \|	Merge branch 'en/rename-directory-detection'	Junio C Hamano	2018-06-18	1	-5/+5
\|\ \ \ \
\| * \| \| \|	merge-recursive: use xstrdup() instead of fixed buffer	René Scharfe	2018-06-14	1	-5/+5
* \| \| \| \|	Merge branch 'sb/submodule-merge-in-merge-recursive'	Junio C Hamano	2018-06-13	1	-2/+2
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \|
\| * \| \| \|	merge-submodule: reduce output verbosity	Leif Middelschulte	2018-06-11	1	-2/+2
* \| \| \| \|	Merge branch 'ma/unpack-trees-free-msgs'	Junio C Hamano	2018-05-30	1	-14/+16
\|\ \ \ \ \
\| * \| \| \| \|	unpack_trees_options: free messages when done	Martin Ågren	2018-05-22	1	-0/+1
\| * \| \| \| \|	merge-recursive: provide pair of `unpack_trees_{start,finish}()`	Elijah Newren	2018-05-20	1	-14/+15
* \| \| \| \| \|	Merge branch 'sb/submodule-merge-in-merge-recursive'	Junio C Hamano	2018-05-30	1	-3/+182
\|\ \ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \|
\| * \| \| \| \|	merge-recursive: give notice when submodule commit gets fast-forwarded	Leif Middelschulte	2018-05-18	1	-0/+16
\| * \| \| \| \|	merge-recursive: i18n submodule merge output and respect verbosity	Stefan Beller	2018-05-16	1	-18/+15
\| * \| \| \| \|	submodule.c: move submodule merging to merge-recursive.c	Stefan Beller	2018-05-16	1	-0/+166
\| \| \|_\|/ / \| \|/\| \| \|
* \| \| \| \|	Merge branch 'js/use-bug-macro'	Junio C Hamano	2018-05-30	1	-6/+6
\|\ \ \ \ \
\| * \| \| \| \|	Replace all die("BUG: ...") calls by BUG() ones	Johannes Schindelin	2018-05-06	1	-6/+6
\| \|/ / / /
* \| \| \| \|	Merge branch 'bp/merge-rename-config'	Junio C Hamano	2018-05-30	1	-6/+25
\|\ \ \ \ \ \| \| \|/ / / \| \|/\| \| \|
\| * \| \| \|	merge: pass aggressive when rename detection is turned off	Ben Peart	2018-05-08	1	-0/+1
\| * \| \| \|	merge: add merge.renames config setting	Ben Peart	2018-05-08	1	-6/+24
* \| \| \| \|	Merge branch 'en/rename-directory-detection-reboot'	Junio C Hamano	2018-05-23	1	-170/+1262
\|\\| \| \| \|
\| * \| \| \|	merge-recursive: fix check for skipability of working tree updates	Elijah Newren	2018-05-08	1	-16/+32
\| * \| \| \|	merge-recursive: make "Auto-merging" comment show for other merges	Elijah Newren	2018-05-08	1	-26/+39