git/builtin at fab47d057559301c74d6642576694fd251a3fd11 - git

History

Junio C Hamano fab47d0575 merge: force edit and no-ff mode when merging a tag object Now that we allow pulling a tag from the remote site to validate the authenticity, we should give the user the final chance to verify and edit the merge message. The integrator is expected to leave a meaningful merge commit log in the history. Disallow fast-forwarding in such a case to ensure that a merge commit is always recorded. Signed-off-by: Junio C Hamano <gitster@pobox.com>		13 years ago
..
add.c	…
annotate.c	…
apply.c	Merge branch 'jm/maint-apply-detects-corrupt-patch-header'	13 years ago
archive.c	…
bisect--helper.c	…
blame.c	…
branch.c	…
bundle.c	…
cat-file.c	…
check-attr.c	Merge branch 'bc/attr-ignore-case'	13 years ago
check-ref-format.c	…
checkout-index.c	…
checkout.c	Merge branch 'jc/checkout-from-tree-keep-local-changes'	13 years ago
clean.c	…
clone.c	…
commit-tree.c	…
commit.c	commit: copy merged signed tags to headers of merge commit	13 years ago
config.c	Merge branch 'mm/maint-config-explicit-bool-display'	13 years ago
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	13 years ago
fmt-merge-msg.c	fmt-merge-msg: Add contents of merged tag in the merge message	13 years ago
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: force edit and no-ff mode when merging a tag object	13 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	Merge branch 'ph/push-to-delete-nothing'	13 years ago
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'	13 years ago
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	13 years ago
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	13 years ago
write-tree.c	…