[nhaehnle]

Put uncommitted changes into a WIP commit (or multiple WIP commits), then fetch & rebase.

Putting stuff in commits ASAP locally is good practice anyway, since it guarantees you will never accidentally lose your work.

[greatgib]

So it is exactly what i'm saying. You need 3 operations, that will completely change the state of your repo folder.

with svn, it was common for me to have something with 50 files.

Currently working on 5 files "v,w,x,y,z".

I noticed a simple typo in file "c":

modify "c", commit "c"

3 pending modifications in "f,g,h".

commit "f"

commit "g"

commit "h"

Someone ask me to correct something else in "c".

svn up, correction and commit "c".

then "svn up", just updating everything without messing with current work on "v,w,x,y,z".

(no need to stash, or rebase, or anything as no one else touched them anyway)

And let's suppose that i just want the new version file "k" without modifying everything in my current working folder:

svn up "k"

Good old time was as easy as that... even if git has its own advantages for some other cases.