From: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
To: Bert Wesarg <bert.wesarg@googlemail.com>
Cc: Felipe Contreras <felipe.contreras@gmail.com>,
git@vger.kernel.org, Jonathan Nieder <jrnieder@gmail.com>
Subject: Re: [PATCH] merge: default to @{upstream}
Date: Fri, 28 Jan 2011 16:41:15 -0500 (EST) [thread overview]
Message-ID: <alpine.DEB.1.10.1101281633580.11103@debian> (raw)
In-Reply-To: <AANLkTimc92giAAJnzjv5Bq4f853xqEfLrgB=j+iRXPaf@mail.gmail.com>
On Fri, 28 Jan 2011, Bert Wesarg wrote:
> 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.
I submitted an RFC patch for that a while ago [1]. I will soon send a
re-roll of some rebase refactoring patches I have been working on (I
have been busy at work and also waiting for 1.7.4 to be finished). I
will then send an updated "default upstream" patch again on top of the
refactoring patches.
And thanks for taking care of the merge case, Felipe. I'm still
struggling with the part of Git written in C, so I'm glad you took
that part.
>
> Anyway, I think some high level sanity check won't harm. Ie. check if
> there is an upstream configured.
Will be done in the case of rebase at least (stolen from the
implementation in git pull).
[1] http://thread.gmane.org/gmane.comp.version-control.git/161382/
next prev parent reply other threads:[~2011-01-28 21:41 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-28 16:17 [PATCH] merge: default to @{upstream} Felipe Contreras
2011-01-28 16:44 ` Drew Northup
2011-01-28 17:53 ` Felipe Contreras
2011-01-28 17:56 ` Jonathan Nieder
2011-01-28 18:46 ` Felipe Contreras
2011-01-30 21:51 ` Jonathan Nieder
2011-01-28 19:53 ` Bert Wesarg
2011-01-28 21:41 ` Martin von Zweigbergk [this message]
2011-01-31 1:55 ` Miles Bader
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.DEB.1.10.1101281633580.11103@debian \
--to=martin.von.zweigbergk@gmail.com \
--cc=bert.wesarg@googlemail.com \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox