Junio C Hamano 8aed4a5e38 Merge branch 'jn/merge-renormalize' ... * jn/merge-renormalize: merge-recursive --renormalize rerere: never renormalize rerere: migrate to parse-options API t4200 (rerere): modernize style ll-merge: let caller decide whether to renormalize ll-merge: make flag easier to populate Documentation/technical: document ll_merge merge-trees: let caller decide whether to renormalize merge-trees: push choice to renormalize away from low level t6038 (merge.renormalize): check that it can be turned off t6038 (merge.renormalize): try checkout -m and cherry-pick t6038 (merge.renormalize): style nitpicks Don't expand CRLFs when normalizing text during merge Try normalizing files to avoid delete/modify conflicts when merging Avoid conflicts when merging branches with mixed normalization Conflicts: builtin/rerere.c t/t4200-rerere.sh		2010-09-03 09:43:41 -07:00
..
.gitignore	Start preparing the API documents.	2007-12-14 22:29:38 -08:00
api-allocation-growing.txt	Start preparing the API documents.	2007-12-14 22:29:38 -08:00
api-builtin.txt	Documentation: fix a grammatical error in api-builtin.txt	2009-04-27 09:36:40 -07:00
api-decorate.txt	Start preparing the API documents.	2007-12-14 22:29:38 -08:00
api-diff.txt	Correct name of diff_flush() in API documentation	2008-02-28 13:35:09 -08:00
api-directory-listing.txt	Read .gitignore from index if it is skip-worktree	2009-08-23 17:13:33 -07:00
api-gitattributes.txt	Start preparing the API documents.	2007-12-14 22:29:38 -08:00
api-grep.txt	Start preparing the API documents.	2007-12-14 22:29:38 -08:00
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	Start preparing the API documents.	2007-12-14 22:29:38 -08:00
api-index-skel.txt	Start preparing the API documents.	2007-12-14 22:29:38 -08:00
api-index.sh	Start preparing the API documents.	2007-12-14 22:29:38 -08:00
api-lockfile.txt	close_lock_file(): new function in the lockfile API	2008-01-16 15:35:03 -08:00
api-merge.txt	ll-merge: make flag easier to populate	2010-08-06 09:20:01 -07:00
api-object-access.txt	Start preparing the API documents.	2007-12-14 22:29:38 -08:00
api-parse-options.txt	Add an optional argument for --color options	2010-02-18 17:21:40 -08:00
api-quote.txt	Start preparing the API documents.	2007-12-14 22:29:38 -08:00
api-remote.txt	technical/api-remote: Describe new struct remote member pushurl	2009-06-09 23:46:47 -07:00
api-revision-walking.txt	Revision walking documentation: document most important functions	2008-05-31 14:32:56 -07:00
api-run-command.txt	Enable threaded async procedures whenever pthreads is available	2010-03-10 14:26:54 -08:00
api-setup.txt	Start preparing the API documents.	2007-12-14 22:29:38 -08:00
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	Start preparing the API documents.	2007-12-14 22:29:38 -08:00
pack-format.txt	Add description of OFS_DELTA to the pack format description	2008-04-06 17:22:46 -07:00
pack-heuristics.txt	Assorted typo fixes	2006-07-09 02:42:41 -07:00
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	Update send-pack pipeline documentation.	2007-01-01 14:35:16 -08:00
shallow.txt	Provide some technical documentation for shallow clones	2007-03-19 22:19:29 -07:00
trivial-merge.txt