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

	Commit message (Expand)	Author	Age
*	Merge branch 'jk/diff-algo' into maint	Junio C Hamano	2013-10-28
\|\
\| *	merge-recursive: fix parsing of "diff-algorithm" option	John Keeping	2013-09-26
* \|	Convert "struct cache_entry *" to "const ..." wherever possible	Nguyễn Thái Ngọc Duy	2013-07-09
\|/
*	diff: Introduce --diff-algorithm command line option	Michal Privoznik	2013-01-16
*	Which merge_file() function do you mean?	Junio C Hamano	2012-12-09
*	Merge branch 'rj/path-cleanup'	Junio C Hamano	2012-09-14
\|\
\| *	Call mkpathdup() rather than xstrdup(mkpath(...))	Ramsay Jones	2012-09-04
* \|	Merge branch 'tr/void-diff-setup-done'	Junio C Hamano	2012-08-22
\|\ \
\| * \|	diff_setup_done(): return void	Thomas Rast	2012-08-03
* \| \|	Merge branch 'tr/merge-recursive-flush'	Junio C Hamano	2012-08-22
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	merge-recursive: eliminate flush_buffer() in favor of write_in_full()	Thomas Rast	2012-08-03
\| \|/
* \|	merge-recursive: separate message for common ancestors	Ralf Thielow	2012-08-05
* \|	i18n: merge-recursive: mark strings for translation	Jiang Xin	2012-07-26
* \|	Merge branch 'jk/diff-no-rename-empty'	Junio C Hamano	2012-04-16
\|\ \
\| * \|	merge-recursive: don't detect renames of empty files	Jeff King	2012-03-23
\| * \|	drop casts from users EMPTY_TREE_SHA1_BIN	Jeff King	2012-03-23
* \| \|	Merge branch 'jc/diff-algo-cleanup'	Junio C Hamano	2012-04-15
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	xdiff: PATIENCE/HISTOGRAM are not independent option bits	Junio C Hamano	2012-02-19
* \| \|	cache-tree: update API to take abitrary flags	Nguyễn Thái Ngọc Duy	2012-02-07
\| \|/ \|/\|
* \|	Merge branch 'tr/cache-tree'	Junio C Hamano	2011-12-19
\|\ \
\| * \|	Refactor cache_tree_update idiom from commit	Thomas Rast	2011-12-06
\| \|/
* \|	merge: make usage of commit->util more extensible	Junio C Hamano	2011-11-08
\|/
*	submodule: Search for merges only at end of recursive merge	Brad King	2011-10-13
*	Merge branch 'cn/eradicate-working-copy'	Junio C Hamano	2011-10-05
\|\
\| *	Remove 'working copy' from the documentation and C code	Carlos Martín Nieto	2011-09-21
* \|	merge-recursive: Do not look at working tree during a virtual ancestor merge	Junio C Hamano	2011-09-23
\|/
*	Merge branch 'en/merge-recursive-2'	Junio C Hamano	2011-09-02
\|\
\| *	merge-recursive: Don't re-sort a list whose order we depend upon	Elijah Newren	2011-08-14
\| *	merge-recursive: Fix virtual merge base for rename/rename(1to2)/add-dest	Elijah Newren	2011-08-14
\| *	merge-recursive: Avoid unnecessary file rewrites	Elijah Newren	2011-08-14
\| *	merge-recursive: Fix spurious 'refusing to lose untracked file...' messages	Elijah Newren	2011-08-14
\| *	merge-recursive: Fix working copy handling for rename/rename/add/add	Elijah Newren	2011-08-14
\| *	merge-recursive: add handling for rename/rename/add-dest/add-dest	Elijah Newren	2011-08-14
\| *	merge-recursive: Have conflict_rename_delete reuse modify/delete code	Elijah Newren	2011-08-14
\| *	merge-recursive: Make modify/delete handling code reusable	Elijah Newren	2011-08-14
\| *	merge-recursive: Consider modifications in rename/rename(2to1) conflicts	Elijah Newren	2011-08-14
\| *	merge-recursive: Create function for merging with branchname:file markers	Elijah Newren	2011-08-14
\| *	merge-recursive: Record more data needed for merging with dual renames	Elijah Newren	2011-08-14
\| *	merge-recursive: Defer rename/rename(2to1) handling until process_entry	Elijah Newren	2011-08-14
\| *	merge-recursive: Small cleanups for conflict_rename_rename_1to2	Elijah Newren	2011-08-14
\| *	merge-recursive: Fix rename/rename(1to2) resolution for virtual merge base	Elijah Newren	2011-08-14
\| *	merge-recursive: Introduce a merge_file convenience function	Elijah Newren	2011-08-14
\| *	merge-recursive: Fix modify/delete resolution in the recursive case	Elijah Newren	2011-08-14
\| *	merge-recursive: When we detect we can skip an update, actually skip it	Elijah Newren	2011-08-14
\| *	merge-recursive: Provide more info in conflict markers with file renames	Elijah Newren	2011-08-14
\| *	merge-recursive: Cleanup and consolidation of rename_conflict_info	Elijah Newren	2011-08-14
\| *	merge-recursive: Consolidate process_entry() and process_df_entry()	Elijah Newren	2011-08-14
\| *	merge-recursive: Improve handling of rename target vs. directory addition	Elijah Newren	2011-08-14
\| *	merge-recursive: Add comments about handling rename/add-source cases	Elijah Newren	2011-08-14
\| *	merge-recursive: Make dead code for rename/rename(2to1) conflicts undead	Elijah Newren	2011-08-14