Junio C Hamano 75b17fee72 Merge branch 'jf/merge-ignore-ws' ... * jf/merge-ignore-ws: merge-recursive: options to ignore whitespace changes merge-recursive --patience ll-merge: replace flag argument with options struct merge-recursive: expose merge options for builtin merge		2010-10-26 21:40:54 -07:00
..
.gitignore
api-allocation-growing.txt
api-builtin.txt	Documentation: fix a grammatical error in api-builtin.txt	2009-04-27 09:36:40 -07:00
api-decorate.txt
api-diff.txt
api-directory-listing.txt	Read .gitignore from index if it is skip-worktree	2009-08-23 17:13:33 -07:00
api-gitattributes.txt
api-grep.txt
api-hash.txt	technical-docs: document hash API	2009-12-17 21:54:50 -08:00
api-history-graph.txt	Documentation: undocument gc'd function graph_release()	2009-11-19 23:05:17 -08:00
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	Documentation/technical: avoid stray backslash in parse-options API docs	2010-08-20 14:16:22 -07:00
api-quote.txt
api-remote.txt	technical/api-remote: Describe new struct remote member pushurl	2009-06-09 23:46:47 -07:00
api-revision-walking.txt
api-run-command.txt	Enable threaded async procedures whenever pthreads is available	2010-03-10 14:26:54 -08:00
api-setup.txt
api-strbuf.txt	strbuf: add strbuf_addbuf_percentquote	2010-01-14 09:25:15 -08:00
api-string-list.txt	string_list: Fix argument order for string_list_append	2010-06-27 10:06:52 -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
pack-format.txt
pack-heuristics.txt
pack-protocol.txt	pack-protocol.txt: fix pkt-line lengths	2010-04-04 10:18:21 -07:00
protocol-capabilities.txt	Documentation: Spelling fix in protocol-capabilities.txt	2010-07-09 17:36:28 -07:00
protocol-common.txt	Update packfile transfer protocol documentation	2009-11-13 12:07:21 -08:00
racy-git.txt	racy-git.txt: explain nsec problem in more detail	2009-10-09 14:56:32 -07:00
send-pack-pipeline.txt
shallow.txt
trivial-merge.txt