[PATCH] merge: default to @{upstream}
From: Felipe Contreras <hidden>
Date: 2016-06-15 22:50:28
Subsystem:
the rest · Maintainer:
Linus Torvalds
So 'git merge' is 'git merge @{upstream}' instead of 'git merge -h';
it's better to do something useful.
Signed-off-by: Felipe Contreras <redacted>
---
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 <msg> HEAD <commit>..." and
--
1.7.4.rc3