git - git

	Commit message (Expand)	Author	Age	Files	Lines
*	Revert "Merge branch 'en/rename-directory-detection'"	Junio C Hamano	2018-04-11	1	-1132/+111
*	Merge branch 'bc/object-id'	Junio C Hamano	2018-04-10	1	-19/+19
\|\
\| *	sha1_file: convert read_sha1_file to struct object_id	brian m. carlson	2018-03-14	1	-2/+2
\| *	tree-walk: convert tree entry functions to object_id	brian m. carlson	2018-03-14	1	-6/+6
\| *	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 'en/rename-directory-detection'	Junio C Hamano	2018-04-10	1	-111/+1132
\|\ \
\| * \|	merge-recursive: ensure we write updates for directory-renamed file	Elijah Newren	2018-02-27	1	-3/+1
\| * \|	merge-recursive: avoid spurious rename/rename conflict from dir renames	Elijah Newren	2018-02-27	1	-2/+2
\| * \|	merge-recursive: fix remaining directory rename + dirty overwrite cases	Elijah Newren	2018-02-27	1	-3/+22
\| * \|	merge-recursive: fix overwriting dirty files involved in renames	Elijah Newren	2018-02-27	1	-19/+66
\| * \|	merge-recursive: avoid clobbering untracked files with directory renames	Elijah Newren	2018-02-27	1	-2/+40
\| * \|	merge-recursive: apply necessary modifications for directory renames	Elijah Newren	2018-02-27	1	-1/+186
\| * \|	merge-recursive: when comparing files, don't include trees	Elijah Newren	2018-02-14	1	-6/+21
\| * \|	merge-recursive: check for file level conflicts then get new name	Elijah Newren	2018-02-14	1	-8/+166
\| * \|	merge-recursive: add computation of collisions due to dir rename & merging	Elijah Newren	2018-02-14	1	-3/+143
\| * \|	merge-recursive: check for directory level conflicts	Elijah Newren	2018-02-14	1	-0/+119
\| * \|	merge-recursive: add get_directory_renames()	Elijah Newren	2018-02-14	1	-3/+221
\| * \|	merge-recursive: make a helper function for cleanup for handle_renames	Elijah Newren	2018-02-14	1	-10/+13
\| * \|	merge-recursive: split out code for determining diff_filepairs	Elijah Newren	2018-02-14	1	-22/+62
\| * \|	merge-recursive: make !o->detect_rename codepath more obvious	Elijah Newren	2018-02-14	1	-2/+9
\| * \|	merge-recursive: fix leaks of allocated renames and diff_filepairs	Elijah Newren	2018-02-14	1	-5/+15
\| * \|	merge-recursive: introduce new functions to handle rename logic	Elijah Newren	2018-02-14	1	-10/+33
\| * \|	merge-recursive: move the get_renames() function	Elijah Newren	2018-02-14	1	-69/+70
* \| \|	Merge branch 'rj/warning-uninitialized-fix'	Junio C Hamano	2018-03-21	1	-1/+1
\|\ \ \
\| * \| \|	-Wuninitialized: remove some 'init-self' workarounds	Ramsay Jones	2018-03-20	1	-1/+1
\| * \| \|	Merge branch 'jc/merge-symlink-ours-theirs' into maint	Junio C Hamano	2018-02-16	1	-4/+13
\| \|\ \ \
* \| \| \| \|	write_locked_index(): add flag to avoid writing unchanged index	Martin Ågren	2018-03-01	1	-3/+2
* \| \| \| \|	merge-recursive: always roll back lock in `merge_recursive_generic()`	Martin Ågren	2018-02-28	1	-1/+4
\| \|_\|_\|/ \|/\| \| \|
* \| \| \|	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
\| \|/ / /