On 8/23/08, Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> wrote: > > > On Sat, 23 Aug 2008, Paolo Ciarrocchi wrote: >> >> you got nice and detailed answers, for example you can track a >> rebased tree in your working directory using git pull --rebase. >> What's wrong with that? > > No, you really really cannot do that. > > If the _tree_ you are tracking is itself rebasing (not just your own > tree), then you cannot and absolutely SHOULD NOT use rebase (not directly, > and not with "git pull --rebase". > > Why? > > Let's look at what happens. Let's say that your history looks like > > ... -> A -> B -> C -> a -> b -> c > > where the upper-case letters are from the tree you track, and the > lower-case letters are the commits you added yourself. > [skipping a nice explanation, thanks] you are right. But i thougth Andi was looking for simply having a working tree in sync with a remote tree that is often rebased. That's what his script is doing. if the user is not adding any commit, isn't git pull --rebase the same of git fetch (or git remote update) +git checkout ? ciao, -- Paolo http://paolo.ciarrocchi.googlepages.com/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
