aboutsummaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2010-08-05 06:17:38 -0500
committerJunio C Hamano <gitster@pobox.com>2010-08-06 09:20:01 -0700
commit73cf7f713da4fc797e2393a9e490ad4ec9466c53 (patch)
tree8d9c9fed8bfb98d0041ec9b4e8c125b5d4f26678 /builtin
parent24d113ec11d9948cedee4ba4687d0775e36b65f9 (diff)
downloadgit-73cf7f713da4fc797e2393a9e490ad4ec9466c53.tar.gz
git-73cf7f713da4fc797e2393a9e490ad4ec9466c53.tar.xz
ll-merge: make flag easier to populate
ll_merge() takes its options in a flag word, which has a few advantages: - options flags can be cheaply passed around in registers, while an option struct passed by pointer cannot; - callers can easily pass 0 without trouble for no options, while an option struct passed by value would not allow that. The downside is that code to populate and access the flag word can be somewhat opaque. Mitigate that with a few macros. Cc: Avery Pennarun <apenwarr@gmail.com> Cc: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
0 files changed, 0 insertions, 0 deletions