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

	Commit message (Expand)	Author	Age
*	Merge branch 'tr/maint-format-patch-empty-output'	Junio C Hamano	2011-09-02
\|\
\| *	t4014: "no-add-headers" is actually called "no-add-header"	Thomas Rast	2011-08-29
\| *	t4014: invoke format-patch with --stdout where intended	Thomas Rast	2011-08-29
\| *	t4014: check for empty files from git format-patch --stdout	Thomas Rast	2011-08-29
* \|	Merge branch 'bg/t5540-osx-grep'	Junio C Hamano	2011-09-02
\|\ \
\| * \|	t5540-http-test: shorten grep pattern	Brian Gernhardt	2011-08-28
* \| \|	Merge branch 'fg/submodule-ff-check-before-push'	Junio C Hamano	2011-09-02
\|\ \ \
\| * \| \|	push: Don't push a repository with unpushed submodules	Fredrik Gustafsson	2011-08-20
* \| \| \|	Merge branch 'fk/use-kwset-pickaxe-grep-f'	Junio C Hamano	2011-09-02
\|\ \ \ \
\| * \| \| \|	Use kwset in grep	Fredrik Kuivinen	2011-08-20
* \| \| \| \|	Merge branch 'en/merge-recursive-2'	Junio C Hamano	2011-09-02
\|\ \ \ \ \
\| * \| \| \| \|	merge-recursive: Fix virtual merge base for rename/rename(1to2)/add-dest	Elijah Newren	2011-08-14
\| * \| \| \| \|	t6036: criss-cross + rename/rename(1to2)/add-dest + simple modify	Elijah Newren	2011-08-14
\| * \| \| \| \|	merge-recursive: Avoid unnecessary file rewrites	Elijah Newren	2011-08-14
\| * \| \| \| \|	t6022: Additional tests checking for unnecessary updates of files	Elijah Newren	2011-08-14
\| * \| \| \| \|	merge-recursive: Fix spurious 'refusing to lose untracked file...' messages	Elijah Newren	2011-08-14
\| * \| \| \| \|	t6022: Add testcase for spurious "refusing to lose untracked" messages	Elijah Newren	2011-08-14
\| * \| \| \| \|	t3030: fix accidental success in symlink rename	Jeff King	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: 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: Fix rename/rename(1to2) resolution for virtual merge base	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: Improve handling of rename target vs. directory addition	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: Allow make_room_for_path() to remove D/F entries	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
\| * \| \| \| \|	t6022: Add testcase for merging a renamed file with a simple change	Elijah Newren	2011-08-14
\| * \| \| \| \|	t6022: New tests checking for unnecessary updates of files	Elijah Newren	2011-08-14
\| * \| \| \| \|	t6022: Remove unnecessary untracked files to make test cleaner	Elijah Newren	2011-08-14
\| * \| \| \| \|	t6036: criss-cross + rename/rename(1to2)/add-source + modify/modify	Elijah Newren	2011-08-14
\| * \| \| \| \|	t6036: criss-cross w/ rename/rename(1to2)/modify+rename/rename(2to1)/modify	Elijah Newren	2011-08-14
\| * \| \| \| \|	t6036: tests for criss-cross merges with various directory/file conflicts	Elijah Newren	2011-08-14
\| * \| \| \| \|	t6036: criss-cross with weird content can fool git into clean merge	Elijah Newren	2011-08-14
\| * \| \| \| \|	t6036: Add differently resolved modify/delete conflict in criss-cross test	Elijah Newren	2011-08-14
\| * \| \| \| \|	t6042: Add failing testcases for rename/rename/add-{source,dest} conflicts	Elijah Newren	2011-08-14
\| * \| \| \| \|	t6042: Ensure rename/rename conflicts leave index and workdir in sane state	Elijah Newren	2011-08-14
\| * \| \| \| \|	t6042: Add tests for content issues with modify/rename/directory conflicts	Elijah Newren	2011-08-14
\| * \| \| \| \|	t6042: Add a testcase where undetected rename causes silent file deletion	Elijah Newren	2011-08-14
\| * \| \| \| \|	t6042: Add a pair of cases where undetected renames cause issues	Elijah Newren	2011-08-14
\| * \| \| \| \|	t6042: Add failing testcase for rename/modify/add-source conflict	Elijah Newren	2011-08-14
\| * \| \| \| \|	t6042: Add a testcase where git deletes an untracked file	Elijah Newren	2011-08-14
* \| \| \| \| \|	git-svn: Teach dcommit --mergeinfo to handle multiple lines	Bryan Jacobs	2011-09-01
* \| \| \| \| \|	git-svn: New flag to emulate empty directories	Ray Chen	2011-09-01
* \| \| \| \| \|	Merge branch 'nd/maint-clone-gitdir'	Junio C Hamano	2011-08-28
\|\ \ \ \ \ \