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

	Commit message (Expand)	Author	Age
...
\| * \|	merge-recursive: Have process_entry() skip D/F or rename entries	Elijah Newren	2010-09-29
\| * \|	merge-recursive: New function to assist resolving renames in-core only	Elijah Newren	2010-09-29
\| * \|	merge-recursive: New data structures for deferring of D/F conflicts	Elijah Newren	2010-09-29
\| * \|	merge-recursive: Move process_entry's content merging into a function	Elijah Newren	2010-09-29
\| * \|	merge-recursive: Move delete/modify handling into dedicated function	Elijah Newren	2010-09-29
\| * \|	merge-recursive: Move rename/delete handling into dedicated function	Elijah Newren	2010-09-29
\| * \|	merge-recursive: Nuke rename/directory conflict detection	Elijah Newren	2010-09-29
\| * \|	merge-recursive: Rename conflict_rename_rename*() for clarity	Elijah Newren	2010-09-29
\| * \|	merge-recursive: Small code clarification -- variable name and comments	Elijah Newren	2010-09-29
\| * \|	merge-recursive: Restructure showing how to chain more process_* functions	Junio C Hamano	2010-09-29
\| * \|	Merge branch 'en/rename-d-f' into en/merge-recursive	Junio C Hamano	2010-09-29
\| \|\ \
\| \| * \|	merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir	Elijah Newren	2010-09-09
* \| \| \|	Merge branch 'kb/merge-recursive-rename-threshold'	Junio C Hamano	2010-10-26
\|\ \ \ \
\| * \| \| \|	merge-recursive: option to specify rename threshold	Kevin Ballard	2010-09-29
* \| \| \| \|	Merge branch 'jf/merge-ignore-ws'	Junio C Hamano	2010-10-26
\|\ \ \ \ \ \| \|/ / / / \| \| / / / \| \|/ / / \|/\| \| \|
\| * \| \|	merge-recursive: options to ignore whitespace changes	Justin Frankel	2010-08-27
\| * \| \|	merge-recursive --patience	Justin Frankel	2010-08-26
\| * \| \|	ll-merge: replace flag argument with options struct	Jonathan Nieder	2010-08-26
\| * \| \|	merge-recursive: expose merge options for builtin merge	Jonathan Nieder	2010-08-26
* \| \| \|	Merge branch 'ks/recursive-rename-add-identical'	Junio C Hamano	2010-09-15
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|
\| * \| \|	RE: [PATCH] Avoid rename/add conflict when contents are identical	Schalk, Ken	2010-09-03
* \| \| \|	Merge branch 'dg/local-mod-error-messages'	Junio C Hamano	2010-09-03
\|\ \ \ \
\| * \| \| \|	setup_unpack_trees_porcelain: take the whole options struct as parameter	Matthieu Moy	2010-09-03
\| * \| \| \|	Move set_porcelain_error_msgs to unpack-trees.c and rename it	Matthieu Moy	2010-09-03
* \| \| \| \|	Merge branch 'jn/merge-renormalize'	Junio C Hamano	2010-09-03
\|\ \ \ \ \ \| \| \|_\|/ / \| \|/\| \| \|
\| * \| \| \|	merge-recursive --renormalize	Jonathan Nieder	2010-08-06
\| * \| \| \|	ll-merge: let caller decide whether to renormalize	Jonathan Nieder	2010-08-06
\| * \| \| \|	ll-merge: make flag easier to populate	Jonathan Nieder	2010-08-06
\| * \| \| \|	merge-trees: let caller decide whether to renormalize	Jonathan Nieder	2010-08-06
\| * \| \| \|	merge-trees: push choice to renormalize away from low level	Jonathan Nieder	2010-08-06
\| * \| \| \|	Try normalizing files to avoid delete/modify conflicts when merging	Eyvind Bernhardsen	2010-07-02
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge branch 'en/d-f-conflict-fix'	Junio C Hamano	2010-08-31
\|\ \ \ \
\| * \| \| \|	merge-recursive: Avoid excessive output for and reprocessing of renames	Elijah Newren	2010-08-20
\| * \| \| \|	merge-recursive: Fix multiple file rename across D/F conflict	Elijah Newren	2010-08-18
\| * \| \| \|	merge-recursive: Fix typo	Elijah Newren	2010-08-18
\| * \| \| \|	merge_recursive: Fix renames across paths below D/F conflicts	Elijah Newren	2010-07-09
\| * \| \| \|	merge-recursive: Fix D/F conflicts	Elijah Newren	2010-07-09
* \| \| \| \|	Merge branch 'hv/submodule-find-ff-merge'	Junio C Hamano	2010-08-21
\|\ \ \ \ \
\| * \| \| \| \|	Implement automatic fast-forward merge for submodules	Heiko Voigt	2010-07-07
* \| \| \| \| \|	Merge branch 'dg/local-mod-error-messages'	Junio C Hamano	2010-08-21
\|\ \ \ \ \ \ \| \| \|_\|_\|/ / \| \|/\| \| \| \|
\| * \| \| \| \|	unpack_trees: group error messages by type	Matthieu Moy	2010-08-11
\| * \| \| \| \|	merge-recursive: distinguish "removed" and "overwritten" messages	Matthieu Moy	2010-08-11
\| * \| \| \| \|	merge-recursive: porcelain messages for checkout	Diane Gasselin	2010-08-11
\| * \| \| \| \|	Turn unpack_trees_options.msgs into an array + enum	Matthieu Moy	2010-08-11
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	Merge branch 'tf/string-list-init'	Junio C Hamano	2010-08-18
\|\ \ \ \ \
\| * \| \| \| \|	string_list: Add STRING_LIST_INIT macro and make use of it.	Thiago Farina	2010-07-05
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge branch 'cc/find-commit-subject'	Junio C Hamano	2010-08-18
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|
\| * \| \| \|	merge-recursive: use find_commit_subject() instead of custom code	Christian Couder	2010-07-23
\| * \| \| \|	Merge branch 'pc/remove-warn' into maint	Junio C Hamano	2010-06-22
\| \|\ \ \ \ \| \| \|_\|/ / \| \|/\| \| \|
* \| \| \| \|	merge-recursive: use "up-to-date" instead of "uptodate" in error message for ...	Nicolas Sebrecht	2010-07-09
\| \|_\|/ / \|/\| \| \|