git/builtin at 635a7bb1d807390bedfc1147d2052e8423bcd1e0 - git

History

Jonathan Nieder 635a7bb1d8 merge-recursive: expose merge options for builtin merge There are two very similar blocks of code that recognize options for the "recursive" merge strategy. Unify them. No functional change intended. Cc: Avery Pennarun <apenwarr@gmail.com> Helped-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>		15 years ago
..
add.c	…
annotate.c	…
apply.c	…
archive.c	…
bisect--helper.c	…
blame.c	Merge branch 'cp/textconv-cat-file'	15 years ago
branch.c	…
bundle.c	…
cat-file.c	Merge branch 'cp/textconv-cat-file'	15 years ago
check-attr.c	…
check-ref-format.c	…
checkout-index.c	…
checkout.c	merge-recursive --renormalize	15 years ago
clean.c	…
clone.c	…
commit-tree.c	…
commit.c	Merge branch 'cc/maint-commit-reflog-msg' into maint	15 years ago
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	15 years ago
merge-tree.c	…
merge.c	merge-recursive: expose merge options for builtin merge	15 years ago
mktag.c	…
mktree.c	…
mv.c	…
name-rev.c	…
notes.c	Merge branch 'maint'	15 years ago
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	15 years ago
reset.c	…
rev-list.c	…
rev-parse.c	…
revert.c	merge-recursive --renormalize	15 years ago
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	…