All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: John Keeping <john@keeping.me.uk>
Cc: Mike Botsko <botsko@gmail.com>, git@vger.kernel.org
Subject: Re: Unexpected/unexplained difference between git pull --rebase and git rebase
Date: Tue, 03 Mar 2015 15:15:15 -0800	[thread overview]
Message-ID: <xmqq61ahad18.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <20150303214653.GQ890@serenity.lan> (John Keeping's message of "Tue, 3 Mar 2015 21:46:53 +0000")

John Keeping <john@keeping.me.uk> writes:

> git-rebase assumes that if you give an explicit upstream then you want
> precisely what you asked for.  From git-rebase(1):
>
> 	If either <upstream> or --root is given on the command line,
> 	then the default is `--no-fork-point`, otherwise the default is
> 	`--fork-point`.

Correct.

You ask it to rebase the history without guessing by being explicit;
the command guesses when you are not explicit and being lazy ;-).

  reply	other threads:[~2015-03-03 23:15 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-03 20:39 Unexpected/unexplained difference between git pull --rebase and git rebase Mike Botsko
2015-03-03 21:09 ` John Keeping
2015-03-03 21:31   ` Mike Botsko
2015-03-03 21:46     ` John Keeping
2015-03-03 23:15       ` Junio C Hamano [this message]
2015-03-03 23:20         ` Mike Botsko
2015-03-03 23:40           ` John Keeping
2015-03-03 23:54             ` Mike Botsko
2015-03-04  9:35               ` John Keeping

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=xmqq61ahad18.fsf@gitster.dls.corp.google.com \
    --to=gitster@pobox.com \
    --cc=botsko@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=john@keeping.me.uk \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.