Skip to contentSkip to conversation

How to rebase after upstream was merged?

DISCUSSION Johannes Sixt 2 participants 3 messages Jun 15, 2016

lore
Share & tools
lore
#0 lore raw

I have this history:

o--o--o--o--o <- origin

    \        \
     x--x--x--M--x--x  <- master (HEAD)

At this point I would like to rebase to straighten the history, but it won't let me:

    $ git rebase origin
    Current branch master is up to date.

However, if there were additional commits on origin, it would work as expected, i.e. all the 'x', but not 'M', would be moved on top of origin. The reason is that rebase checks whether the merge base of origin and HEAD is origin, and exits early if it is.

I would like to extend the check to also check for linear history. How can I do this most efficiently? My first try is along these lines:

  test $(git rev-list origin..HEAD | wc -l) = \
       $(git rev-list --no-merges origin..HEAD | wc -l)

Is there a better approach?

-- Hannes

#1 lore raw

Hi,

Quoted 11 lines · Johannes Sixt

I have this history:

o--o--o--o--o <- origin

    \        \
     x--x--x--M--x--x  <- master (HEAD)

At this point I would like to rebase to straighten the history, but it won't let me:

    $ git rebase origin
    Current branch master is up to date.

I'd do something like

$ git checkout -b tmp HEAD~3
$ git rebase origin
$ git checkout master
$ git rebase --onto tmp HEAD~2
$ git branch -d tmp
Quoted 7 lines

I would like to extend the check to also check for linear history. How can I do this most efficiently? My first try is along these lines:

  test $(git rev-list origin..HEAD | wc -l) = \
       $(git rev-list --no-merges origin..HEAD | wc -l)

Is there a better approach?

I usually to

	test -z "$(git rev-list --parents origin..HEAD | grep " .* ")"

Hth,
Dscho

#2 lore raw
Quoted 4 lines · Johannes Schindelin

[...how to check for linear history...]
I usually to

        test -z "$(git rev-list --parents origin..HEAD | grep " .* ")"

Ah, that's much better.

Thanks,
-- Hannes