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

..

add.c

…

annotate.c

…

apply.c

…

archive.c

…

bisect--helper.c

…

blame.c

Merge branch 'cp/textconv-cat-file'

2010-06-27 12:07:55 -07:00

branch.c

…

bundle.c

…

cat-file.c

Merge branch 'cp/textconv-cat-file'

2010-06-27 12:07:55 -07:00

check-attr.c

…

check-ref-format.c

…

checkout-index.c

…

checkout.c

ll-merge: replace flag argument with options struct

2010-08-26 09:18:51 -07:00

clean.c

…

clone.c

…

commit-tree.c

…

commit.c

Merge branch 'cc/maint-commit-reflog-msg' into maint

2010-06-22 09:31:48 -07:00

config.c

…

count-objects.c

…

describe.c

…

diff-files.c

…

diff-index.c

…

diff-tree.c

…

diff.c

…

fast-export.c

…

fetch-pack.c

…

fetch.c

…

fmt-merge-msg.c

…

for-each-ref.c

…

fsck.c

…

gc.c

…

grep.c

…

hash-object.c

…

help.c

…

index-pack.c

…

init-db.c

…

log.c

…

ls-files.c

…

ls-remote.c

…

ls-tree.c

…

mailinfo.c

…

mailsplit.c

…

merge-base.c

…

merge-file.c

…

merge-index.c

…

merge-ours.c

…

merge-recursive.c

merge-recursive: expose merge options for builtin merge

2010-08-26 09:05:02 -07:00

merge-tree.c

…

merge.c

merge-recursive: expose merge options for builtin merge

2010-08-26 09:05:02 -07:00

mktag.c

…

mktree.c

…

mv.c

…

name-rev.c

…

notes.c

Merge branch 'maint'

2010-06-25 11:45:27 -07:00

pack-objects.c

…

pack-redundant.c

…

pack-refs.c

…

patch-id.c

…

prune-packed.c

…

prune.c

…

push.c

…

read-tree.c

…

receive-pack.c

…

reflog.c

…

remote.c

…

replace.c

…

rerere.c

rerere: migrate to parse-options API

2010-08-06 09:20:02 -07:00

reset.c

…

rev-list.c

…

rev-parse.c

…

revert.c

merge-recursive --renormalize

2010-08-06 09:20:02 -07:00

rm.c

…

send-pack.c

…

shortlog.c

…

show-branch.c

…

show-ref.c

…

stripspace.c

…

symbolic-ref.c

…

tag.c

…

tar-tree.c

…

unpack-file.c

…

unpack-objects.c

…

update-index.c

…

update-ref.c

…

update-server-info.c

…

upload-archive.c

…

var.c

…

verify-pack.c

…

verify-tag.c

…

write-tree.c

…