git/builtin at 8f29299136c2f11730d876cd62637a9e37d4c388 - git

History

Junio C Hamano 8f29299136 merge-base --octopus: reduce the result from get_octopus_merge_bases() Scripts that use "merge-base --octopus" could do the reducing themselves, but most of them are expected to want to get the reduced results without having to do any work themselves. Tests are taken from a message by Василий Макаров <einmalfel@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> --- We might want to vet the existing callers of the underlying get_octopus_merge_bases() and find out if _all_ of them are doing anything extra (like deduping) because the machinery can return duplicate results. And if that is the case, then we may want to move the dedupling down the callchain instead of having it here.		11 years ago
..
add.c	…
annotate.c	…
apply.c	Git 1.8.3.4	12 years ago
archive.c	…
bisect--helper.c	…
blame.c	…
branch.c	…
bundle.c	…
cat-file.c	Revert "cat-file: split --batch input lines on whitespace"	12 years ago
check-attr.c	…
check-ignore.c	…
check-mailmap.c	…
check-ref-format.c	…
checkout-index.c	…
checkout.c	Merge branch 'mm/checkout-auto-track-fix' into maint	11 years ago
clean.c	Merge branch 'jx/clean-interactive'	12 years ago
clone.c	Merge branch 'jk/clone-progress-to-stderr' into maint	12 years ago
column.c	…
commit-tree.c	…
commit.c	commit: search author pattern against mailmap	12 years ago
config.c	…
count-objects.c	…
credential.c	…
describe.c	…
diff-files.c	…
diff-index.c	…
diff-tree.c	…
diff.c	…
fast-export.c	many small typofixes	12 years ago
fetch-pack.c	…
fetch.c	builtin/fetch.c: Fix a sparse warning	12 years ago
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	Merge branch 'jc/ls-files-killed-optim' into maint	12 years ago
ls-remote.c	…
ls-tree.c	…
mailinfo.c	…
mailsplit.c	…
merge-base.c	merge-base --octopus: reduce the result from get_octopus_merge_bases()	11 years ago
merge-file.c	…
merge-index.c	…
merge-ours.c	…
merge-recursive.c	…
merge-tree.c	…
merge.c	…
mktag.c	…
mktree.c	…
mv.c	…
name-rev.c	…
notes.c	…
pack-objects.c	list-objects: reduce one argument in mark_edges_uninteresting	12 years ago
pack-redundant.c	…
pack-refs.c	…
patch-id.c	…
prune-packed.c	…
prune.c	…
push.c	many small typofixes	12 years ago
read-tree.c	…
receive-pack.c	…
reflog.c	…
remote-ext.c	…
remote-fd.c	…
remote.c	…
replace.c	…
rerere.c	…
reset.c	…
rev-list.c	list-objects: reduce one argument in mark_edges_uninteresting	12 years ago
rev-parse.c	…
revert.c	…
rm.c	Merge branch 'jc/rm-submodule-error-message'	12 years ago
send-pack.c	…
shortlog.c	Merge branch 'jk/shortlog-tolerate-broken-commit' into maint	12 years ago
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	…