Junio C Hamano 57b58db74c merge: notice local merging of tags and keep it unwrapped ... This also updates the autogenerated merge title message from "merge commit X" to "merge tag X", and its effect can be seen in the changes to the test suite. Signed-off-by: Junio C Hamano <gitster@pobox.com>		2011-11-07 14:06:39 -08:00
..
add.c
annotate.c
apply.c	Merge branch 'jm/maint-apply-detects-corrupt-patch-header'	2011-10-19 10:48:29 -07:00
archive.c
bisect--helper.c
blame.c
branch.c
bundle.c
cat-file.c
check-attr.c	Merge branch 'bc/attr-ignore-case'	2011-10-17 21:37:14 -07:00
check-ref-format.c
checkout-index.c
checkout.c	Merge branch 'jc/checkout-from-tree-keep-local-changes'	2011-10-17 21:37:09 -07:00
clean.c
clone.c
commit-tree.c
commit.c
config.c	Merge branch 'mm/maint-config-explicit-bool-display'	2011-10-17 21:37:12 -07:00
count-objects.c
describe.c
diff-files.c
diff-index.c
diff-tree.c
diff.c
fast-export.c
fetch-pack.c
fetch.c	fetch: do not store peeled tag object names in FETCH_HEAD	2011-11-04 21:40:25 -07:00
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: notice local merging of tags and keep it unwrapped	2011-11-07 14:06:39 -08:00
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	Merge branch 'ph/push-to-delete-nothing'	2011-10-17 21:37:10 -07:00
reflog.c
remote-ext.c
remote-fd.c
remote.c
replace.c
rerere.c
reset.c
rev-list.c
rev-parse.c
revert.c	Merge branch 'js/no-cherry-pick-head-after-punted'	2011-10-19 10:49:05 -07:00
rm.c
send-pack.c
shortlog.c
show-branch.c
show-ref.c
stripspace.c
symbolic-ref.c
tag.c	Split GPG interface into its own helper library	2011-11-04 21:40:25 -07:00
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	Split GPG interface into its own helper library	2011-11-04 21:40:25 -07:00
write-tree.c