git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: "J. Bruce Fields" <bfields@fieldses.org>
Cc: Junio C Hamano <gitster@pobox.com>,
	Lars Hjemli <hjemli@gmail.com>,
	Steven Grimm <koreth@midwinter.com>,
	Linus Torvalds <torvalds@linux-foundation.org>,
	git@vger.kernel.org
Subject: Re: [PATCH v2] Teach 'git pull' about --rebase
Date: Wed, 28 Nov 2007 23:12:32 +0000 (GMT)	[thread overview]
Message-ID: <Pine.LNX.4.64.0711282309030.27959@racer.site> (raw)
In-Reply-To: <20071128224717.GG7376@fieldses.org>

Hi,

On Wed, 28 Nov 2007, J. Bruce Fields wrote:

> Would it be possible to add this to rebase instead of to pull?
> 
> 	git rebase --url git://x.org/x.git master
> 
> where --url means "interpret <upstream> as a branch from the given
> remote repository.

I was briefly considering it.

But the point is this: I know exactly if I want to rebase my branch onto 
upstream, or if I want to merge it.  There is not much point in mixing the 
two.

So my rationale was: if we already have an existing framework to integrate 
remote changes with our current branch, why not just go ahead and use it?  
That's the reason BTW why I originally wanted a "rebase" merge stragegy.  
Even if it is not technically a merge.

I really rather have no user-friendly support for fetch+rebase (and utter 
a friendly, but loud curse everytime I made a "git pull" by mistake) than 
yet another command.

Ciao,
Dscho

  reply	other threads:[~2007-11-28 23:13 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-10-25 22:54 [PATCH] Teach 'git pull' the '--rebase' option Johannes Schindelin
2007-10-25 23:04 ` Linus Torvalds
2007-10-25 23:10   ` Johannes Schindelin
2007-10-25 23:36     ` Linus Torvalds
2007-10-25 23:49       ` Linus Torvalds
2007-10-25 23:54     ` Junio C Hamano
2007-10-26  9:52       ` Johannes Schindelin
2007-11-28  0:11         ` Junio C Hamano
2007-11-28 13:11           ` [PATCH v2] Teach 'git pull' about --rebase Johannes Schindelin
2007-11-28 13:15             ` Jonathan del Strother
2007-11-28 14:02               ` Johannes Schindelin
2007-11-28 13:19             ` Jakub Narebski
2007-11-28 20:35             ` Steven Grimm
2007-11-28 20:40               ` Johannes Schindelin
2007-11-28 21:10                 ` Lars Hjemli
2007-11-28 21:55                   ` Junio C Hamano
2007-11-28 21:58                     ` Johannes Schindelin
2007-11-28 22:06                       ` Steven Grimm
2007-11-28 22:33                       ` J. Bruce Fields
2007-11-28 22:47                         ` J. Bruce Fields
2007-11-28 23:12                           ` Johannes Schindelin [this message]
2007-11-28 23:32                             ` Junio C Hamano
2007-11-28 23:56                               ` J. Bruce Fields
2007-11-29  0:16                                 ` Johannes Schindelin
2007-11-29  8:36                               ` Andreas Ericsson
2007-11-29  3:23                         ` Nicolas Pitre
2007-11-28 21:59                     ` Jon Loeliger
2007-11-28 22:02                       ` Johannes Schindelin
2007-12-01 20:37                     ` Björn Steinbrink
2007-12-03 13:10                       ` Karl Hasselström
2007-10-26 11:43     ` [PATCH] Teach 'git pull' the '--rebase' option Jeff King
2007-10-26 11:45       ` Jeff King

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=Pine.LNX.4.64.0711282309030.27959@racer.site \
    --to=johannes.schindelin@gmx.de \
    --cc=bfields@fieldses.org \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=hjemli@gmail.com \
    --cc=koreth@midwinter.com \
    --cc=torvalds@linux-foundation.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;
as well as URLs for NNTP newsgroup(s).