Junio C Hamano 96b7c4deb8 Merge branch 'en/merge-recursive-2' ... * en/merge-recursive-2: (57 commits) merge-recursive: Don't re-sort a list whose order we depend upon merge-recursive: Fix virtual merge base for rename/rename(1to2)/add-dest t6036: criss-cross + rename/rename(1to2)/add-dest + simple modify merge-recursive: Avoid unnecessary file rewrites t6022: Additional tests checking for unnecessary updates of files merge-recursive: Fix spurious 'refusing to lose untracked file...' messages t6022: Add testcase for spurious "refusing to lose untracked" messages t3030: fix accidental success in symlink rename merge-recursive: Fix working copy handling for rename/rename/add/add merge-recursive: add handling for rename/rename/add-dest/add-dest merge-recursive: Have conflict_rename_delete reuse modify/delete code merge-recursive: Make modify/delete handling code reusable merge-recursive: Consider modifications in rename/rename(2to1) conflicts merge-recursive: Create function for merging with branchname:file markers merge-recursive: Record more data needed for merging with dual renames merge-recursive: Defer rename/rename(2to1) handling until process_entry merge-recursive: Small cleanups for conflict_rename_rename_1to2 merge-recursive: Fix rename/rename(1to2) resolution for virtual merge base merge-recursive: Introduce a merge_file convenience function merge-recursive: Fix modify/delete resolution in the recursive case ...		2011-09-02 10:00:18 -07:00
..
.gitignore
api-allocation-growing.txt
api-builtin.txt	add gitignore entry to description about how to write a builtin	2011-08-03 11:44:23 -07:00
api-decorate.txt
api-diff.txt	Documentation/technical/api-diff.txt: correct name of diff_unmerge()	2011-05-26 14:50:24 -07:00
api-directory-listing.txt
api-gitattributes.txt	Rename git_checkattr() to git_check_attr()	2011-08-04 15:53:21 -07:00
api-grep.txt
api-hash.txt
api-history-graph.txt
api-in-core-index.txt
api-index-skel.txt
api-index.sh
api-lockfile.txt
api-merge.txt	ll-merge: replace flag argument with options struct	2010-08-26 09:18:51 -07:00
api-object-access.txt
api-parse-options.txt	add OPT__FORCE	2010-11-15 10:04:43 -08:00
api-quote.txt
api-ref-iteration.txt	add technical documentation about ref iteration	2011-08-22 15:01:14 -07:00
api-remote.txt
api-revision-walking.txt
api-run-command.txt
api-setup.txt
api-sigchain.txt	Fix typos in the documentation	2011-01-04 11:23:42 -08:00
api-strbuf.txt
api-string-list.txt	string-list: Add API to remove an item from an unsorted list	2011-08-14 14:19:35 -07:00
api-tree-walking.txt	unpack_trees: group error messages by type	2010-08-11 10:36:06 -07:00
api-xdiff-interface.txt
index-format.txt	Documentation: clarify the invalidated tree entry format	2011-07-31 18:23:49 -07:00
pack-format.txt
pack-heuristics.txt
pack-protocol.txt	Document the underlying protocol used by shallow repositories and --depth commands.	2011-06-08 18:08:21 -07:00
protocol-capabilities.txt
protocol-common.txt
racy-git.txt
send-pack-pipeline.txt
shallow.txt
trivial-merge.txt