Thomas Rast f26af3fcbc merge: add instructions to the commit message when editing ... Before f824628 (merge: use editor by default in interactive sessions, 2012-01-10), git-merge only started an editor if the user explicitly asked for it with --edit. Thus it seemed unlikely that the user would need extra guidance. After f824628 the _normal_ thing is to start an editor. Give at least an indication of why we are doing it. The sentence about justification is one of the few things about standard git that are not agnostic to the workflow that the user chose. However, f824628 was proposed by Linus specifically to discourage users from merging unrelated upstream progress into topic branches. So we may as well take another step in the same direction. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2012-01-31 12:04:38 -08:00
..
add.c	bulk-checkin: replace fast-import based implementation	2011-12-01 11:46:09 -08:00
annotate.c
apply.c	Merge branch 'bc/maint-apply-check-no-patch' into maint	2011-12-21 11:42:45 -08:00
archive.c	Revert "upload-archive: use start_command instead of fork"	2011-11-15 15:39:33 -08:00
bisect--helper.c
blame.c	Merge branch 'maint-1.7.7' into maint	2011-12-13 21:58:51 -08:00
branch.c	Merge branch 'jn/branch-move-to-self' into maint	2011-12-28 11:32:33 -08:00
bundle.c	Teach progress eye-candy to fetch_refs_from_bundle()	2011-09-19 11:07:21 -07:00
cat-file.c
check-attr.c	Merge branch 'bc/attr-ignore-case'	2011-10-17 21:37:14 -07:00
check-ref-format.c	Change check_refname_format() to reject unnormalized refnames	2011-10-05 13:45:30 -07:00
checkout-index.c
checkout.c	Merge branch 'jc/checkout-m-twoway' into maint	2011-12-28 11:44:54 -08:00
clean.c
clone.c	clone: the -o option has nothing to do with <branch>	2011-12-21 11:26:30 -08:00
commit-tree.c	Merge branch 'jc/show-sig'	2012-01-06 12:44:07 -08:00
commit.c	Merge branch 'jc/show-sig'	2012-01-06 12:44:07 -08:00
config.c	Merge branch 'jv/maint-config-set' into maint	2011-12-28 12:03:19 -08:00
count-objects.c
describe.c	describe: Refresh the index when run with --dirty	2011-09-23 14:28:17 -07:00
diff-files.c
diff-index.c
diff-tree.c
diff.c	use struct sha1_array in diff_tree_combined()	2011-12-17 18:21:37 -08:00
fast-export.c	Fix an enum assignment issue spotted by Sun Studio	2011-12-21 10:19:04 -08:00
fetch-pack.c	fetch-pack: match refs exactly	2011-12-13 10:17:50 -08:00
fetch.c	write first for-merge ref to FETCH_HEAD first	2012-01-03 16:13:14 -08:00
fmt-merge-msg.c	Convert resolve_ref+xstrdup to new resolve_refdup function	2011-12-13 09:26:52 -08:00
for-each-ref.c	Convert resolve_ref+xstrdup to new resolve_refdup function	2011-12-13 09:26:52 -08:00
fsck.c	Rename resolve_ref() to resolve_ref_unsafe()	2011-12-13 09:39:46 -08:00
gc.c	prune: handle --progress/no-progress	2011-11-07 22:12:19 -08:00
grep.c	grep: disable threading in non-worktree case	2011-12-16 15:47:25 -08:00
hash-object.c
help.c
index-pack.c	Appease Sun Studio by renaming "tmpfile"	2011-12-21 10:21:04 -08:00
init-db.c	builtin/init-db.c: eliminate -Wformat warning on Solaris	2011-12-20 16:02:08 -08:00
log.c	Sync with v1.7.8.1	2011-12-21 12:02:44 -08:00
ls-files.c	Merge branch 'cb/common-prefix-unification'	2011-10-10 15:56:17 -07:00
ls-remote.c	Merge branch 'jc/ls-remote-short-help'	2011-10-05 12:36:26 -07:00
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: add instructions to the commit message when editing	2012-01-31 12:04:38 -08:00
mktag.c
mktree.c	Merge "Move 'builtin-*' into a 'builtin/' subdirectory"	2011-11-10 09:10:51 -08:00
mv.c	Merge branch 'jk/maint-mv' into maint	2011-12-28 11:32:36 -08:00
name-rev.c	Merge branch 'jc/maint-name-rev-all' into maint-1.7.6	2011-12-13 21:12:34 -08:00
notes.c	Merge branch 'nd/war-on-nul-in-commit'	2011-12-22 11:27:26 -08:00
pack-objects.c	Merge branch 'maint'	2012-01-12 23:33:39 -08:00
pack-redundant.c
pack-refs.c
patch-id.c	patch-id.c: use strbuf instead of a fixed buffer	2011-09-22 09:35:07 -07:00
prune-packed.c
prune.c	prune: handle --progress/no-progress	2011-11-07 22:12:19 -08:00
push.c
read-tree.c
receive-pack.c	Merge branch 'mh/ref-api-less-extra-refs'	2012-01-09 15:58:43 -08:00
reflog.c	prune: show progress while marking reachable objects	2011-11-07 22:12:19 -08:00
remote-ext.c
remote-fd.c
remote.c	Rename resolve_ref() to resolve_ref_unsafe()	2011-12-13 09:39:46 -08:00
replace.c	Convert many resolve_ref() calls to read_ref*() and ref_exists()	2011-11-13 12:21:06 -08:00
rerere.c
reset.c	reset: update cache-tree data when appropriate	2011-12-06 15:13:39 -08:00
rev-list.c
rev-parse.c
revert.c	Merge branch 'rr/revert-cherry-pick'	2011-12-22 15:30:22 -08:00
rm.c
send-pack.c	drop "match" parameter from get_remote_heads	2011-12-13 10:08:24 -08:00
shortlog.c
show-branch.c	Rename resolve_ref() to resolve_ref_unsafe()	2011-12-13 09:39:46 -08:00
show-ref.c	Convert many resolve_ref() calls to read_ref*() and ref_exists()	2011-11-13 12:21:06 -08:00
stripspace.c	Update documentation for stripspace	2011-12-12 16:48:54 -08:00
symbolic-ref.c	Rename resolve_ref() to resolve_ref_unsafe()	2011-12-13 09:39:46 -08:00
tag.c	Merge branch 'ks/tag-cleanup'	2011-12-13 23:07:47 -08:00
tar-tree.c
unpack-file.c
unpack-objects.c
update-index.c
update-ref.c
update-server-info.c
upload-archive.c	upload-archive: use start_command instead of fork	2011-11-21 14:32:40 -08:00
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