From: Felipe Contreras Date: Fri, 28 Jan 2011 16:17:37 GMT Subject: [PATCH] merge: default to @{upstream} Message-ID: <1296231457-18780-1-git-send-email-felipe.contreras@gmail.com> So 'git merge' is 'git merge @{upstream}' instead of 'git merge -h'; it's better to do something useful. Signed-off-by: Felipe Contreras --- builtin/merge.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/builtin/merge.c b/builtin/merge.c index 42fff38..f23d669 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -983,9 +983,11 @@ int cmd_merge(int argc, const char **argv, const char *prefix) if (!allow_fast_forward && fast_forward_only) die("You cannot combine --no-ff with --ff-only."); - if (!argc) - usage_with_options(builtin_merge_usage, - builtin_merge_options); + if (!argc) { + /* argv[argc] should be NULL, so we can hijack it */ + argv[0] = "@{u}"; + argc = 1; + } /* * This could be traditional "merge HEAD ..." and -- 1.7.4.rc3