From: Bert Wesarg <bert.wesarg@googlemail.com>
Date: Fri, 28 Jan 2011 19:53:34 GMT
Subject: Re: [PATCH] merge: default to @{upstream}
Message-ID: <AANLkTimc92giAAJnzjv5Bq4f853xqEfLrgB=j+iRXPaf@mail.gmail.com>
In-Reply-To: <1296231457-18780-1-git-send-email-felipe.contreras@gmail.com>

On Fri, Jan 28, 2011 at 17:17, Felipe Contreras
<felipe.contreras@gmail.com> wrote:
> So 'git merge' is 'git merge @{upstream}' instead of 'git merge -h';
> it's better to do something useful.

Nice idea. Could you have a look into git rebase, I think this could
be applied there too.

Anyway, I think some high level sanity check won't harm. Ie. check if
there is an upstream configured.

Thanks.
Bert