[MPlayer-dev-eng] Git Checklist Was: Git migration

[Erik Auerswald]

Hi,

On Wed, Jan 12, 2011 at 09:46:29PM +0100, Luca Barbato wrote:
> On 1/12/11 5:02 PM, Nico Sabbi wrote:
>>
>> what's the advantage of git over svn? I don't know if and when I'll have
>> the time to return coding for mplayer,
>> but in case I'd like to know what death to die for:) .
>> You know, I'm quite conservative regarding my development tools.
>
> Faster
>
> Compact (the whole history takes the space of a single svn checkout...)
>
> Better tools provided by default (git grep, git bisect, git checkout -p)
>
> Easier way to send and merge patches (git send-email, git format-patch,  
> git am)

Especially when working on a bigger feature it's nice to make several local
commits and then send a patch series instead of one huge patch.

> Better tracking of files (git tracks lines and discovers rewrites and  
> renames by itself)
>
> And probably some other stuff I'm forgetting

I really like git stash: you work on something, stumble upon an existing
bug, git stash your current work, fix the bug, commit this fix, and
continue working on your feature after reapplying the stashed changes.

> I wrote for ffmpeg a small guide, it gives most of the pointers for get  
> an idea of the commands (they are a bit different).

The "git cheat cheat" at
http://zrusin.blogspot.com/2007/09/git-cheat-sheet.html is quite nice as a
quick reminder.

Erik
-- 
Rule 34: If you’re leaving scorch-marks, you need a bigger gun.
                        -- The Seven Habits of Highly Effective Pirates