[LAD] OT - git rebase - was [LAU] OpenOctaveMidi2 (OOM2) beta release

[Robin Gareus]

On 01/29/2011 10:01 PM, Robin Gareus wrote:
> On 01/28/2011 04:37 PM, torbenh wrote:
> 
>> you really need to keep your history clean. 
>> take a bit of time. use git rebase -i
>> before you push stuff upstream.
>> (or at least before you merge it into the master branch)
>>
>> this makes me sad.
> 
> Hi Torben,
> 
> Was that meant as sarcasm (kill the git hitory) or seriously - allow
> upsteam to cherry-pick easily?
> 
> I rarely use rebase and only on local topic branches that have never
> been pushed to a public repo. It changes the history and will cause
> problems to anyone who has pulled that branch before.
> 
> Since you are a git guru, could you please elaborate?
> 

answering [part of] my own question, "git guru" was the key:
 http://gitguru.com/2009/02/03/rebase-v-merge-in-git/

"Rebases are how changes should pass from the top of hierarchy downwards
and merges are how they flow back upwards."

Is that what you were alluding to?

robin