git question

[Joris Huizer]

Hello,

As a new wine is released I'm trying to get updated.
Before I had used git for generating patches, I could
do:

git fetch; git rebase origin

however, now this doesn't seem to pickup anything.
How should I tell git to actually update to the files
on the server?

Thanks,

Joris

____________________________________________________________________________________
Do you Yahoo!?
Everyone is raving about the all-new Yahoo! Mail beta.
http://new.mail.yahoo.com

[Jeff L]

Joris Huizer wrote:
> git fetch; git rebase origin

Have you committed all updates before you git rebase origin?  git commit 
-a -m "all"; git rebase origin; git reset HEAD^

Jeff Latimer

[Stefan Dösinger]

Am Freitag 16 Februar 2007 17:32 schrieb Joris Huizer:
> Hello,
>
> As a new wine is released I'm trying to get updated.
> Before I had used git for generating patches, I could
> do:
>
> git fetch; git rebase origin
>
> however, now this doesn't seem to pickup anything.
> How should I tell git to actually update to the files
> on the server?

That should still work. Does it give any error message? Most likely some of 
the patches in your tree conflict with some newly commited patches on the 
server.