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 23:33:23 +0100	[thread overview]
Message-ID: <adf1fd3d1001071433j6cd36641sdd2dfd6a936d8483@mail.gmail.com> (raw)
In-Reply-To: <1262889864880-4268064.post@n2.nabble.com>

[Do not top post, as it breaks the conversation flow]

On Thu, Jan 7, 2010 at 7:44 PM, martinvz
<martin.von.zweigbergk@gmail.com> wrote:
>
> Thanks for your post, Santi. I can not share my repository since it is a
> project at work. I was troubleshooting a bit myself and found the following
> section in git-pull.sh:
>
>        oldremoteref="$(git rev-parse -q --verify "$remoteref")" &&
>        for reflog in $(git rev-list -g $remoteref 2>/dev/null)
>        do
>                if test "$reflog" = "$(git merge-base $reflog $curr_branch)"
>                then
>                        oldremoteref="$reflog"
>                        break
>                fi
>        done
>
> Why is it that reflog entries are allowed to override the remote reference?

This is used when the upstream branch is rebased, as you only want to
rebase the local commits and not commits in the old upstream branch.

Is your upstream branch rebased?

Can you provide, at least, a graph of your history (ala git log
--graph --oneline for example)? And plot also the reflog entries and
all the important commits.

Santi

  reply	other threads:[~2010-01-07 22:33 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
2010-01-07 18:44   ` martinvz
2010-01-07 22:33     ` Santi Béjar [this message]
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=adf1fd3d1001071433j6cd36641sdd2dfd6a936d8483@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.