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
\| * \| \| \| \| \| \| \| \| \| \| \|	t6036: Add testcase for undetected conflict	Elijah Newren	2010-09-29
\| * \| \| \| \| \| \| \| \| \| \| \|	t6036: Add a second testcase similar to the first but with content changes	Elijah Newren	2010-09-29
\| * \| \| \| \| \| \| \| \| \| \| \|	t6036: Test index and worktree state, not just that merge fails	Elijah Newren	2010-09-29
\| * \| \| \| \| \| \| \| \| \| \| \|	t6020: Add a testcase for modify/delete + directory/file conflict	Elijah Newren	2010-09-29
\| * \| \| \| \| \| \| \| \| \| \| \|	t6020: Modernize style a bit	Elijah Newren	2010-09-29
\| * \| \| \| \| \| \| \| \| \| \| \|	t6022: Add tests for rename/rename combined with D/F conflicts	Elijah Newren	2010-09-29
\| * \| \| \| \| \| \| \| \| \| \| \|	t6022: Add paired rename+D/F conflict: (two/file, one/file) -> (one, two)	Elijah Newren	2010-09-29
\| * \| \| \| \| \| \| \| \| \| \| \|	t6022: Add tests with both rename source & dest involved in D/F conflicts	Elijah Newren	2010-09-29
\| * \| \| \| \| \| \| \| \| \| \| \|	t6022: Add tests for reversing order of merges when D/F conflicts present	Elijah Newren	2010-09-29
\| * \| \| \| \| \| \| \| \| \| \| \|	t6022: Add test combinations of {content conflict?, D/F conflict remains?}	Elijah Newren	2010-09-29
\| * \| \| \| \| \| \| \| \| \| \| \|	t6032: Add a test checking for excessive output from merge	Elijah Newren	2010-09-29
\| * \| \| \| \| \| \| \| \| \| \| \|	merge-recursive: Restructure showing how to chain more process_* functions	Junio C Hamano	2010-09-29
\| * \| \| \| \| \| \| \| \| \| \| \|	t3030: Add a testcase for resolvable rename/add conflict with symlinks	Schalk, Ken	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
\| \| * \| \| \| \| \| \| \| \| \| \| \|	t3509: Add rename + D/F conflict testcase that recursive strategy fails	Elijah Newren	2010-09-09
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'jl/clone-recurse-sm-synonym'	Junio C Hamano	2010-11-29
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	clone: Add the --recurse-submodules option as alias for --recursive	Jens Lehmann	2010-11-05
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'jn/cherry-pick-refresh-index'	Junio C Hamano	2010-11-29
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	cherry-pick/revert: transparently refresh index	Jonathan Nieder	2010-11-10
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'jc/emfile'	Junio C Hamano	2010-11-29
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	A loose object is not corrupt if it cannot be read due to EMFILE	Junio C Hamano	2010-11-03
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	read_sha1_file(): report correct name of packfile with a corrupt object	Junio C Hamano	2010-11-03
\| \| \|_\|/ / / / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'md/interix'	Junio C Hamano	2010-11-29
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Interix: add configure checks	Markus Duft	2010-10-28
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add support for the SUA layer (interix; windows)	Markus Duft	2010-10-28
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'jl/add-p-reverse-message'	Junio C Hamano	2010-11-29
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Correct help blurb in checkout -p and friends	Jonathan "Duke" Leto	2010-10-28
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'np/pack-broken-boundary'	Junio C Hamano	2010-11-29
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	make pack-objects a bit more resilient to repo corruption	Nicolas Pitre	2010-10-22
\| \|/ / / / / / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'np/diff-in-corrupt-repository'	Junio C Hamano	2010-11-29
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	diff: don't presume empty file when corresponding object is missing	Nicolas Pitre	2010-10-21
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'fc/apply-p2-get-header-name'	Junio C Hamano	2010-11-29
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	test: git-apply -p2 rename/chmod only	Junio C Hamano	2010-11-05
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix git-apply with -p greater than 1	Federico Cuello	2010-11-05
\| \| \|/ / / / / / / / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'jn/fast-import-fix'	Junio C Hamano	2010-11-29
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fast-import: do not clear notes in do_change_note_fanout()	Jonathan Nieder	2010-10-20
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	t9300 (fast-import): another test for the "replace root" feature	Jonathan Nieder	2010-10-19
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fast-import: tighten M 040000 syntax	Jonathan Nieder	2010-10-18
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fast-import: filemodify after M 040000 <tree> "" crashes	Jonathan Nieder	2010-10-18
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'rr/needs-clean-work-tree'	Junio C Hamano	2010-11-29
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \