Git development
 help / color / mirror / Atom feed
From: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>,
	git@vger.kernel.org, Yann Dirson <ydirson@altern.org>,
	Jonathan Nieder <jrnieder@gmail.com>,
	Sverre Rabbelier <srabbelier@gmail.com>
Subject: Re: [PATCH] rebase: use @{upstream} if no upstream specified
Date: Wed, 9 Feb 2011 21:46:14 -0500 (EST)	[thread overview]
Message-ID: <alpine.DEB.2.00.1102092136580.20937@debian> (raw)
In-Reply-To: <7voc6k62xq.fsf@alter.siamese.dyndns.org>

On Wed, 9 Feb 2011, Junio C Hamano wrote:

> Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> writes:
> 
> > 'git rebase' without arguments is currently not supported. Make it
> > default to 'git rebase @{upstream}'. That is also what 'git pull
> > [--rebase]' defaults to, so it only makes sense that 'git rebase'
> > defaults to the same thing.
> 
> Not that I am fundamentally opposed to the proposed change, but the above is
> not a very convincing argument, when the corresponding change to "git merge"
> is just started getting discussed.

There was a little more motivation later in the commit message, like
using it with 'git rebase -i'. I have been using it for a few months
now, and I also find it quite useful e.g. when rebasing all my
branches on top of your master.

> 
> On top of what commit does this patch apply, by the way?

On top of the rebase refactoring series I posted a few days ago. See
http://thread.gmane.org/gmane.comp.version-control.git/166161/.


/Martin

      reply	other threads:[~2011-02-10  2:46 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-02-08  0:37 [PATCH] rebase: use @{upstream} if no upstream specified Martin von Zweigbergk
2011-02-08 17:46 ` Sverre Rabbelier
2011-02-08 18:23   ` Martin von Zweigbergk
2011-02-08 18:27     ` Sverre Rabbelier
2011-02-08 22:05     ` Jonathan Nieder
2011-02-09  0:28       ` Martin von Zweigbergk
2011-02-09  1:50         ` Martin von Zweigbergk
2011-02-09  4:17           ` Jonathan Nieder
2011-02-10  1:15             ` Martin von Zweigbergk
2011-02-10  1:54 ` Martin von Zweigbergk
2011-02-10  2:25   ` Junio C Hamano
2011-02-10  2:46     ` Martin von Zweigbergk [this message]

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.2.00.1102092136580.20937@debian \
    --to=martin.von.zweigbergk@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jrnieder@gmail.com \
    --cc=srabbelier@gmail.com \
    --cc=ydirson@altern.org \
    /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