git/builtin at ff372c7851f36bfe0e113e23d247cb9033e79559 - git

History

Jonathan Nieder b81f925f70 merge: do not mistake (ancestor of) tag for branch If no branch 'foo' exists but a tag 'foo' does, then git merge foo^ results in Merge branch 'foo' (early part) as a commit message, because the relevant code path checks that refs/heads/foo is a valid refname for writing rather than for reading. 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	…
branch.c	…
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	…
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-tree.c	…
merge.c	merge: do not mistake (ancestor of) tag for branch	15 years ago
mktag.c	…
mktree.c	…
mv.c	…
name-rev.c	…
notes.c	…
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	…
reset.c	…
rev-list.c	…
rev-parse.c	…
revert.c	…
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	…