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

	Commit message (Expand)	Author	Age
*	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
*	merge-recursive: Fix deletion of untracked file in rename/delete conflicts	Elijah Newren	2011-08-14
*	merge-recursive: Split update_stages_and_entry; only update stages at end	Elijah Newren	2011-08-14
*	merge-recursive: Allow make_room_for_path() to remove D/F entries	Elijah Newren	2011-08-14
*	merge-recursive: Split was_tracked() out of would_lose_untracked()	Elijah Newren	2011-08-14
*	merge-recursive: Save D/F conflict filenames instead of unlinking them	Elijah Newren	2011-08-14
*	merge-recursive: Fix code checking for D/F conflicts still being present	Elijah Newren	2011-08-14
*	merge-recursive: Fix sorting order and directory change assumptions	Elijah Newren	2011-08-14
*	merge-recursive: Fix recursive case with D/F conflict via add/add conflict	Elijah Newren	2011-08-14
*	merge-recursive: Avoid working directory changes during recursive case	Elijah Newren	2011-08-14
*	merge-recursive: Remember to free generated unique path names	Elijah Newren	2011-08-14
*	merge-recursive: Consolidate different update_stages functions	Elijah Newren	2011-08-14
*	merge-recursive: Mark some diff_filespec struct arguments const	Elijah Newren	2011-08-14
*	merge-recursive: Correct a comment	Elijah Newren	2011-08-14
*	merge-recursive: Make BUG message more legible by adding a newline	Elijah Newren	2011-08-14
*	Merge branch 'jc/rename-degrade-cc-to-c' into maint	Junio C Hamano	2011-05-31
\|\
\| *	diffcore-rename: fall back to -C when -C -C busts the rename limit	Junio C Hamano	2011-03-22
* \|	add, merge, diff: do not use strcasecmp to compare config variable names	Jonathan Nieder	2011-05-14
* \|	Fix two unused variable warnings in gcc 4.6	Dan McGee	2011-04-03
\|/
*	Merge branch 'jk/merge-rename-ux'	Junio C Hamano	2011-03-19
\|\
\| *	merge: enable progress reporting for rename detection	Jeff King	2011-02-21
\| *	bump rename limit defaults (again)	Jeff King	2011-02-21
\| *	merge: improve inexact rename limit warning	Jeff King	2011-02-21
* \|	Merge branch 'maint'	Junio C Hamano	2011-03-16
\|\ \
\| * \|	standardize brace placement in struct definitions	Jonathan Nieder	2011-03-16
\| \|/
* \|	strbuf: add strbuf_vaddf	Jeff King	2011-02-26
\|/
*	Merge branch 'en/merge-recursive'	Junio C Hamano	2010-11-29
\|\
\| *	merge-recursive:make_room_for_directories - work around dumb compilers	Junio C Hamano	2010-10-21
\| *	merge-recursive: Remove redundant path clearing for D/F conflicts	Elijah Newren	2010-09-29
\| *	merge-recursive: Make room for directories in D/F conflicts	Elijah Newren	2010-09-29