git - git

	Commit message (Expand)	Author	Age	Files	Lines
*	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
\|\
\| *	object-store: move object access functions to object-store.h	Stefan Beller	2018-05-16	1	-0/+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
\| * \| \|	merge-recursive: fix remainder of was_dirty() to use original index	Elijah Newren	2018-05-08	1	-3/+3
\| * \| \|	merge-recursive: fix was_tracked() to quit lying with some renamed paths	Elijah Newren	2018-05-08	1	-24/+67
\| * \| \|	merge-recursive: avoid triggering add_cacheinfo error with dirty mod	Elijah Newren	2018-05-08	1	-1/+1
\| * \| \|	merge-recursive: move more is_dirty handling to merge_content	Elijah Newren	2018-05-08	1	-18/+12
\| * \| \|	merge-recursive: improve add_cacheinfo error handling	Elijah Newren	2018-05-08	1	-5/+8
\| * \| \|	merge-recursive: avoid spurious rename/rename conflict from dir renames	Elijah Newren	2018-05-08	1	-2/+2
\| * \| \|	merge-recursive: fix remaining directory rename + dirty overwrite cases	Elijah Newren	2018-05-08	1	-3/+22
\| * \| \|	merge-recursive: fix overwriting dirty files involved in renames	Elijah Newren	2018-05-08	1	-19/+66
\| * \| \|	merge-recursive: avoid clobbering untracked files with directory renames	Elijah Newren	2018-05-08	1	-2/+40
\| * \| \|	merge-recursive: apply necessary modifications for directory renames	Elijah Newren	2018-05-08	1	-1/+186
\| * \| \|	merge-recursive: when comparing files, don't include trees	Elijah Newren	2018-05-08	1	-6/+21
\| * \| \|	merge-recursive: check for file level conflicts then get new name	Elijah Newren	2018-05-08	1	-8/+166
\| * \| \|	merge-recursive: add computation of collisions due to dir rename & merging	Elijah Newren	2018-05-08	1	-3/+143
\| * \| \|	merge-recursive: check for directory level conflicts	Elijah Newren	2018-05-08	1	-0/+119
\| * \| \|	merge-recursive: add get_directory_renames()	Elijah Newren	2018-05-08	1	-3/+221
\| * \| \|	merge-recursive: make a helper function for cleanup for handle_renames	Elijah Newren	2018-04-20	1	-10/+13
\| * \| \|	merge-recursive: split out code for determining diff_filepairs	Elijah Newren	2018-04-20	1	-22/+62
\| * \| \|	merge-recursive: make !o->detect_rename codepath more obvious	Elijah Newren	2018-04-20	1	-2/+9
\| * \| \|	merge-recursive: fix leaks of allocated renames and diff_filepairs	Elijah Newren	2018-04-20	1	-5/+15
\| * \| \|	merge-recursive: introduce new functions to handle rename logic	Elijah Newren	2018-04-20	1	-10/+33
\| * \| \|	merge-recursive: move the get_renames() function	Elijah Newren	2018-04-20	1	-69/+70
\| \|/ /
* \| \|	Merge branch 'ds/lazy-load-trees'	Junio C Hamano	2018-05-23	1	-2/+3
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	treewide: replace maybe_tree with accessor methods	Derrick Stolee	2018-04-11	1	-2/+2