git/builtin at 9bdd868744401593baf7a872bd0986ab3b2e6acc - git

History

Junio C Hamano edf141218e Merge branch 'jc/merge-reduce-parents-early' into maint Octopus merge strategy did not reduce heads that are recorded in the final commit correctly. By Junio C Hamano (4) and Michał Kiedrowicz (1) * jc/merge-reduce-parents-early: fmt-merge-msg: discard needless merge parents builtin/merge.c: reduce parents early builtin/merge.c: collect other parents early builtin/merge.c: remove "remoteheads" global variable merge tests: octopus with redundant parents		13 years ago
..
add.c	…
annotate.c	…
apply.c	…
archive.c	…
bisect--helper.c	…
blame.c	Merge branch 'jc/maint-blame-minimal' into maint	13 years ago
branch.c	Merge branch 'cn/maint-branch-with-bad' into maint	13 years ago
bundle.c	…
cat-file.c	…
check-attr.c	…
check-ref-format.c	…
checkout-index.c	…
checkout.c	…
clean.c	…
clone.c	…
commit-tree.c	…
commit.c	Merge branch 'jc/commit-unedited-template' into maint	13 years ago
config.c	config: remove useless assignment	13 years ago
count-objects.c	…
describe.c	…
diff-files.c	…
diff-index.c	…
diff-tree.c	…
diff.c	drop casts from users EMPTY_TREE_SHA1_BIN	13 years ago
fast-export.c	Merge branch 'rs/no-no-no-parseopt'	13 years ago
fetch-pack.c	Merge branch 'it/fetch-pack-many-refs' into maint	13 years ago
fetch.c	Merge branch 'mb/fetch-call-a-non-branch-a-ref' into maint	13 years ago
fmt-merge-msg.c	fmt-merge-msg: discard needless merge parents	13 years ago
for-each-ref.c	…
fsck.c	fsck: --no-dangling omits "dangling object" information	13 years ago
gc.c	…
grep.c	Merge branch 'rs/no-no-no-parseopt'	13 years ago
hash-object.c	…
help.c	…
index-pack.c	…
init-db.c	…
log.c	diff --stat: add config option to limit graph width	13 years ago
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-tree.c	…
merge.c	Merge branch 'jc/merge-reduce-parents-early' into maint	13 years ago
mktag.c	…
mktree.c	…
mv.c	…
name-rev.c	…
notes.c	…
pack-objects.c	pack-objects: Fix compilation with NO_PTHREDS	13 years ago
pack-redundant.c	…
pack-refs.c	…
patch-id.c	…
prune-packed.c	fix deletion of .git/objects sub-directories in git-prune/repack	13 years ago
prune.c	fix deletion of .git/objects sub-directories in git-prune/repack	13 years ago
push.c	push: error out when the "upstream" semantics does not make sense	13 years ago
read-tree.c	…
receive-pack.c	…
reflog.c	…
remote-ext.c	…
remote-fd.c	…
remote.c	Merge branch 'pj/remote-set-branches-usage-fix' into maint	13 years ago
replace.c	…
rerere.c	…
reset.c	…
rev-list.c	rev-list: fix --verify-objects --quiet becoming --objects	13 years ago
rev-parse.c	…
revert.c	cherry-pick: do not expect file arguments	13 years ago
rm.c	…
send-pack.c	…
shortlog.c	…
show-branch.c	…
show-ref.c	…
stripspace.c	…
symbolic-ref.c	symbolic-ref --short: abbreviate the output unambiguously	13 years ago
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	verify-tag: Parse GPG configuration options.	13 years ago
write-tree.c	…