Merge or Cherry-Pick?

[John Layt]

On Wednesday 02 February 2011 07:27:01 Dawit A 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...

Never have uncommitted changes, git is designed around frequent local commits 
as checkpoints in your development which you can later clean-up by collapsing 
them into fewer commits and re-writing the commit message just before pushing 
to the main repo.

John.