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

	Commit message (Expand)	Author	Age
*	Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with...	Junio C Hamano	2018-01-09
\|\
\| *	merge-recursive: do not look at the index during recursive merge	Junio C Hamano	2018-01-09
* \|	Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with...	Junio C Hamano	2017-12-22
\|\ \ \| \|/
\| *	merge-recursive: avoid incorporating uncommitted changes in a merge	Elijah Newren	2017-12-22
* \|	Merge branch 'en/merge-recursive-icase-removal'	Junio C Hamano	2017-12-19
\|\ \
\| * \|	merge-recursive: ignore_case shouldn't reject intentional removals	Elijah Newren	2017-11-27
* \| \|	Merge branch 'bc/hash-algo'	Junio C Hamano	2017-12-13
\|\ \ \
\| * \| \|	Switch empty tree and blob lookups to use hash abstraction	brian m. carlson	2017-11-13
* \| \| \|	Merge branch 'sb/test-cherry-pick-submodule-getting-in-a-way'	Junio C Hamano	2017-11-27
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \|
\| * \| \|	merge-recursive: handle addition of submodule on our side of history	Elijah Newren	2017-11-15
\| \| \|/ \| \|/\|
* \| \|	Merge branch 'jc/ignore-cr-at-eol'	Junio C Hamano	2017-11-27
\|\ \ \
\| * \| \|	diff: --ignore-cr-at-eol	Junio C Hamano	2017-11-08
* \| \| \|	Merge branch 'ao/merge-verbosity-getenv-just-once'	Junio C Hamano	2017-11-15
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|
\| * \| \|	merge-recursive: check GIT_MERGE_VERBOSITY only once	Andrey Okoshkin	2017-11-01
\| \|/ /
* \| \|	Merge branch 'bw/diff-opt-impl-to-bitfields'	Junio C Hamano	2017-11-09
\|\ \ \
\| * \| \|	diff: make struct diff_flags members lowercase	Brandon Williams	2017-11-01
\| * \| \|	diff: remove DIFF_OPT_CLR macro	Brandon Williams	2017-11-01
\| * \| \|	diff: remove DIFF_OPT_SET macro	Brandon Williams	2017-11-01
\| \| \|/ \| \|/\|
* \| \|	treewide: prefer lockfiles on the stack	Martin Ågren	2017-10-06
\|/ /
* \|	Merge branch 'kw/merge-recursive-cleanup'	Junio C Hamano	2017-09-19
\|\ \
\| * \|	merge-recursive: change current file dir string_lists to hashmap	Kevin Willford	2017-09-08
\| * \|	merge-recursive: remove return value from get_files_dirs	Kevin Willford	2017-09-06
\| * \|	merge-recursive: fix memory leak	Kevin Willford	2017-09-06
* \| \|	treewide: correct several "up-to-date" to "up to date"	Martin Ågren	2017-08-23
\|/ /
* \|	Merge branch 'sb/merge-recursive-code-cleanup'	Junio C Hamano	2017-07-06
\|\ \ \| \|/
\| *	merge-recursive: use DIFF_XDL_SET macro	Stefan Beller	2017-06-30
* \|	Merge branch 'bw/config-h'	Junio C Hamano	2017-06-24
\|\ \
\| * \|	config: don't include config.h by default	Brandon Williams	2017-06-15
\| \|/
* \|	Merge branch 'bw/ls-files-sans-the-index'	Junio C Hamano	2017-06-24
\|\ \
\| * \|	convert: convert renormalize_buffer to take an index	Brandon Williams	2017-06-13
* \| \|	diff-tree: convert diff_tree_sha1 to struct object_id	Brandon Williams	2017-06-05
\|/ /
* \|	object: convert parse_object* to take struct object_id	brian m. carlson	2017-05-08
* \|	Convert lookup_tree to struct object_id	brian m. carlson	2017-05-08
* \|	submodule: convert merge_submodule to use struct object_id	brian m. carlson	2017-05-08
* \|	Convert struct cache_tree to use struct object_id	brian m. carlson	2017-05-02
\|/
*	Merge branch 'mm/merge-rename-delete-message'	Junio C Hamano	2017-02-27
\|\
\| *	merge-recursive: make "CONFLICT (rename/delete)" message show both paths	Matt McCutchen	2017-01-30
\| *	Merge branch 'nd/qsort-in-merge-recursive' into maint	Junio C Hamano	2017-01-17
\| \|\
\| * \	Merge branch 'jc/renormalize-merge-kill-safer-crlf' into maint	Junio C Hamano	2017-01-17
\| \|\ \
* \| \| \|	use SWAP macro	René Scharfe	2017-01-30
* \| \| \|	Merge branch 'jc/lock-report-on-error'	Junio C Hamano	2016-12-19
\|\ \ \ \
\| * \| \| \|	hold_locked_index(): align error handling with hold_lockfile_for_update()	Junio C Hamano	2016-12-07
* \| \| \| \|	Merge branch 'jc/renormalize-merge-kill-safer-crlf'	Junio C Hamano	2016-12-19
\|\ \ \ \ \ \| \| \|_\|/ / \| \|/\| \| \|
\| * \| \| \|	merge-recursive: handle NULL in add_cacheinfo() correctly	Johannes Schindelin	2016-11-28
* \| \| \| \|	Merge branch 'nd/qsort-in-merge-recursive'	Junio C Hamano	2016-12-16
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| / \| \| \|_\|/ \| \|/\| \|
\| * \| \|	merge-recursive.c: use string_list_sort instead of qsort	Nguyễn Thái Ngọc Duy	2016-11-28
* \| \| \|	submodules: allow empty working-tree dirs in merge/cherry-pick	David Turner	2016-11-17
\| \|_\|/ \|/\| \|
* \| \|	Merge branch 'rs/cocci'	Junio C Hamano	2016-10-17
\|\ \ \ \| \|/ /
\| * \|	use strbuf_add_unique_abbrev() for adding short hashes, part 3	René Scharfe	2016-10-10
* \| \|	Merge branch 'rs/cocci'	Junio C Hamano	2016-09-26
\|\ \ \ \| \|/ /