Vincent van Ravesteijn 5480207c4e Show error for 'git merge' with unset merge.defaultToUpstream ... 'git merge' can be called without any arguments if merge.defaultToUpstream is set. However, when merge.defaultToUpstream is not set, the user will be presented the usage information as if he entered a command with a wrong syntaxis. Ironically, the usage information confirms that no arguments are mandatory. This adds a proper error message telling the user why the command failed. As a side-effect this can help the user in discovering the possibility to merge with the upstream branch by setting merge.defaultToUpstream. Signed-off-by: Vincent van Ravesteijn <vfr@lyx.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2011-11-21 09:29:06 -08:00
..
add.c
annotate.c
apply.c	Merge branch 'jc/apply-blank-at-eof-fix' into maint	2011-10-21 10:49:26 -07:00
archive.c	Merge branch 'il/archive-err-signal' into maint	2011-10-21 10:49:25 -07:00
bisect--helper.c	bisect: introduce support for --no-checkout option.	2011-08-04 15:34:32 -07:00
blame.c
branch.c	Merge branch 'ci/forbid-unwanted-current-branch-update'	2011-09-16 21:48:10 -07:00
bundle.c	Teach progress eye-candy to fetch_refs_from_bundle()	2011-09-19 11:07:21 -07:00
cat-file.c	plug a few coverity-spotted leaks	2011-06-20 14:27:36 -07:00
check-attr.c	attr: read core.attributesfile from git_default_core_config	2011-10-06 13:54:32 -07:00
check-ref-format.c	check-ref-format --print: Normalize refnames that start with slashes	2011-08-25 13:39:38 -07:00
checkout-index.c	checkout-index: remove obsolete comment	2011-08-17 10:39:47 -07:00
checkout.c	Merge branch 'jk/argv-array' into maint	2011-10-26 16:13:31 -07:00
clean.c	Documentation: clarify "git clean -e <pattern>"	2011-08-28 23:47:55 -07:00
clone.c	clone: Quote user supplied path in a single quote pair	2011-10-27 12:02:02 -07:00
commit-tree.c
commit.c	Merge branch 'nd/maint-autofix-tag-in-head' into maint	2011-10-21 10:49:26 -07:00
config.c	Merge branch 'mm/maint-config-explicit-bool-display' into maint	2011-10-21 10:49:24 -07: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	want_color: automatically fallback to color.ui	2011-08-19 15:51:38 -07:00
fast-export.c	Merge branch 'jk/fast-export-quote-path' into maint	2011-08-16 12:41:12 -07:00
fetch-pack.c	Merge branch 'nd/decorate-grafts'	2011-08-28 21:22:58 -07:00
fetch.c	fetch: treat --tags like refs/tags/*:refs/tags/* when pruning	2011-10-15 22:00:37 -07:00
fmt-merge-msg.c	Accept tags in HEAD or MERGE_HEAD	2011-09-18 14:11:40 -07:00
for-each-ref.c
fsck.c	fsck: do not abort upon finding an empty blob	2011-09-11 18:03:38 -07:00
gc.c	builtin/gc.c: add missing newline in message	2011-06-19 14:46:39 -07:00
grep.c	Merge branch 'nm/grep-object-sha1-lock' into maint	2011-10-15 20:46:37 -07:00
hash-object.c
help.c
index-pack.c	Merge branch 'jc/zlib-wrap' into maint	2011-08-16 11:23:26 -07:00
init-db.c	read_gitfile_gently(): rename misnamed function to read_gitfile()	2011-08-22 14:04:56 -07:00
log.c	format-patch: ignore ui.color	2011-09-12 11:43:58 -07:00
ls-files.c	Merge branch 'cb/maint-ls-files-error-report'	2011-08-23 15:34:31 -07:00
ls-remote.c
ls-tree.c	Ensure git ls-tree exits with a non-zero exit code if read_tree_recursive fails.	2011-07-25 10:50:11 -07:00
mailinfo.c	mailinfo: always clean up rfc822 header folding	2011-05-26 14:13:38 -07:00
mailsplit.c
merge-base.c
merge-file.c
merge-index.c
merge-ours.c
merge-recursive.c
merge-tree.c
merge.c	Show error for 'git merge' with unset merge.defaultToUpstream	2011-11-21 09:29:06 -08:00
mktag.c
mktree.c
mv.c	builtin/mv.c: plug miniscule memory leak	2011-10-06 13:54:32 -07:00
name-rev.c	Merge branch 'jc/maint-name-rev-all' into maint	2011-11-18 11:14:16 -08:00
notes.c
pack-objects.c	pack-objects: don't traverse objects unnecessarily	2011-10-20 17:17:49 -07: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
push.c	push: Don't push a repository with unpushed submodules	2011-08-20 23:03:52 -07:00
read-tree.c
receive-pack.c	refactor run_receive_hook()	2011-09-12 16:40:06 -07:00
reflog.c	reflog: actually default to subcommand 'show'	2011-08-01 10:52:34 -07:00
remote-ext.c
remote-fd.c
remote.c	Merge branch 'cn/fetch-prune' into maint	2011-11-01 15:51:01 -07:00
replace.c
rerere.c
reset.c	Merge branch 'jk/reset-reflog-message-fix' into maint	2011-09-11 22:33:20 -07:00
rev-list.c	Merge branch 'jk/format-patch-am'	2011-05-31 12:19:11 -07:00
rev-parse.c
revert.c	Merge branch 'jn/plug-empty-tree-leak'	2011-08-25 16:00:29 -07:00
rm.c
send-pack.c	Revert "Merge branch 'cb/maint-quiet-push' into maint"	2011-09-06 11:10:41 -07:00
shortlog.c	Merge branch 'jk/format-patch-am'	2011-05-31 12:19:11 -07:00
show-branch.c	want_color: automatically fallback to color.ui	2011-08-19 15:51:38 -07:00
show-ref.c
stripspace.c
symbolic-ref.c
tag.c	Merge branch 'jk/tag-contains-ab' (early part) into maint	2011-09-11 21:54:32 -07:00
tar-tree.c
unpack-file.c
unpack-objects.c	zlib: zlib can only process 4GB at a time	2011-06-10 11:52:15 -07:00
update-index.c	plug a few coverity-spotted leaks	2011-06-20 14:27:36 -07:00
update-ref.c	update-ref: whitespace fix	2011-08-25 14:42:11 -07:00
update-server-info.c
upload-archive.c	upload-archive: allow user to turn off filters	2011-06-22 11:12:35 -07:00
var.c
verify-pack.c	verify-pack: use index-pack --verify	2011-06-05 22:45:38 -07:00
verify-tag.c
write-tree.c