Felipe Contreras <[email protected]> writes:
> 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.
And a new possible failure case is when there is no upstream defined
for the current branch, which gets perfectly good new error message:
$ git merge
fatal: No remote for the current branch.
So I think this is good. We want to protect this with a new test,
no?
Will queue as-is for now.
> Signed-off-by: Felipe Contreras <[email protected]>
> ---
> Documentation/git-merge.txt | 5 ++---
> builtin/merge.c | 2 +-
> 2 files changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
> index a3c1fa3..cf2c374 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 66d8843..1fc9319 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[] = {
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
