Re: Cluttering the git tree

[Rob Browning <rlb@defaultvalue.org>]

Andreas Schwab <schwab@linux-m68k.org> writes:

> Lars Magne Ingebrigtsen <larsi@gnus.org> writes:

>> Well, he could just say "git pull --rebase", right?
>
> That doesn't clean up the intermediate commits, it just transplants
> them.

And in more detail, it effectively

  1) runs git fetch to update the local copy of the relevant upstream
     branch,

  2) removes all of your pending commits from the current branch,

  3) moves the current branch forward to match the local upstream copy
     that was just fetched,

  4) and then attempts to reapply all of the patches that were removed
     in step 2 to the updated current branch (i.e. the rebase).

If anything goes wrong with a patch in step 4, you'll be walked through
a resolution process (as with all rebases).  And at any point, if you
want to start over, you can run "git rebase --abort".

Hope this helps
-- 
Rob Browning
rlb @defaultvalue.org and @debian.org
GPG as of 2011-07-10 E6A9 DA3C C9FD 1FF8 C676 D2C4 C0F0 39E9 ED1B 597A
GPG as of 2002-11-03 14DD 432F AE39 534D B592 F9A0 25C8 D377 8C7E 73A4