Merge or Cherry-Pick?

[John Tapsell]

On 2 February 2011 07:27, Dawit A <adawit at kde.org> wrote:
> Ahh... I see. It is push everything upto that commit, not just push
> that commit. Ouch! That is almost as much a hassle as the convoluted
> method I am following now. Do not commit anything that is not ready to
> be pushed into my own local branch. Use git stash to save the
> uncommited changes before doing the pull --rebase and apply the
> stashed changes after doing the push...

And then one day you do  "git checkout ."  by mistake and lose all
your local uncommitted changes that you just spent a week working on
..