All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Santi Béjar" <santi@agolina.net>
To: martinvz <martin.von.zweigbergk@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Difference between pull --rebase and fetch+rebase
Date: Thu, 7 Jan 2010 17:00:36 +0100	[thread overview]
Message-ID: <adf1fd3d1001070800k6fa501fej39b84f849b7e5b50@mail.gmail.com> (raw)
In-Reply-To: <27059158.post@talk.nabble.com>

On Thu, Jan 7, 2010 at 1:23 PM, martinvz
<martin.von.zweigbergk@gmail.com> wrote:
>
> I have a branch configured to track a remote branch by rebasing. I excepted
> that "git pull" would therefore be equivalent to fetching from the remote
> repository followed by rebasing the remote branch, but it isn't. When doing
> "git rebase <remote>/<branch>", it applies only the commits after the merge
> base. When doing "git pull", it tries to apply two more commits (the two
> commits preceding the merge base). Why is this?
>
> I get the same result even if I do "git pull --rebase <remote> <branch>", it
> doesn't seem to have anything to do with incorrect configuration of the
> branch.

Yes, both should do the same (at least when upstream is not rebased).
Can you provide a test case or instructions to reproduce the behavior?

Thanks,
Santi

  parent reply	other threads:[~2010-01-07 16:00 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-01-07 12:23 Difference between pull --rebase and fetch+rebase martinvz
2010-01-07 12:58 ` martinvz
2010-01-07 16:00 ` Santi Béjar [this message]
2010-01-07 18:44   ` martinvz
2010-01-07 22:33     ` Santi Béjar
2010-01-07 23:38       ` martinvz
2010-01-08 11:05         ` Santi Béjar
2010-01-08 19:41           ` martinvz

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=adf1fd3d1001070800k6fa501fej39b84f849b7e5b50@mail.gmail.com \
    --to=santi@agolina.net \
    --cc=git@vger.kernel.org \
    --cc=martin.von.zweigbergk@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 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.