Jonathan Nieder 712516bcac ll-merge: replace flag argument with options struct ... Keeping track of the flag bits is proving more trouble than it's worth. Instead, use a pointer to an options struct like most similar APIs do. Callers with no special requests can pass NULL to request the default options. Cc: Bert Wesarg <bert.wesarg@googlemail.com> Cc: Avery Pennarun <apenwarr@gmail.com> Helped-by: Justin Frankel <justin@cockos.com> Helped-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2010-08-26 09:18:51 -07:00
..
.gitignore
api-allocation-growing.txt
api-builtin.txt
api-decorate.txt
api-diff.txt
api-directory-listing.txt
api-gitattributes.txt
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
api-quote.txt
api-remote.txt
api-revision-walking.txt
api-run-command.txt
api-setup.txt
api-strbuf.txt
api-string-list.txt	string-list: add unsorted_string_list_lookup()	2010-03-24 19:41:19 -07:00
api-tree-walking.txt
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
protocol-common.txt
racy-git.txt
send-pack-pipeline.txt
shallow.txt
trivial-merge.txt