diff options
| author | Felipe Contreras <felipe.contreras@gmail.com> | 2014-04-20 19:17:33 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-04-22 12:53:59 -0700 |
| commit | a01f7f2ba0e73ffbee0fa1ec9a5a78f276cc173d (patch) | |
| tree | 85511431579f68ce408f37e6cc35a6e1fe154876 | |
| parent | 779792a5f24bb4e8049c4f88ad752e70d4a8a080 (diff) | |
| download | git-fc/merge-default-to-upstream.tar.gz | |
merge: enable defaulttoupstream by defaultfc/merge-default-to-upstream
There's no point in this:
% git merge
fatal: No commit specified and merge.defaultToUpstream not set.
We know the most likely scenario is that the user wants to merge the
upstream, and if not, he can set merge.defaultToUpstream to false.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/git-merge.txt | 5 | ||||
| -rw-r--r-- | builtin/merge.c | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index a3c1fa332a..cf2c374b71 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -101,9 +101,8 @@ commit or stash your changes before running 'git merge'. Specifying more than one commit will create a merge with more than two parents (affectionately called an Octopus merge). + -If no commit is given from the command line, and if `merge.defaultToUpstream` -configuration variable is set, merge the remote-tracking branches -that the current branch is configured to use as its upstream. +If no commit is given from the command line, merge the remote-tracking +branches that the current branch is configured to use as its upstream. See also the configuration section of this manual page. diff --git a/builtin/merge.c b/builtin/merge.c index 66d8843301..1fc9319d8f 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -63,7 +63,7 @@ static int verbosity; static int allow_rerere_auto; static int abort_current_merge; static int show_progress = -1; -static int default_to_upstream; +static int default_to_upstream = 1; static const char *sign_commit; static struct strategy all_strategy[] = { |