[FFmpeg-devel] Git short walkthrought Was: [GIT] ready by the weekend

[Michael Niedermayer]

On Fri, Dec 10, 2010 at 01:33:08PM +0100, Luca Barbato wrote:
[...]
> 2. Updating the source tree to the latest revision:
> 
>     git pull
> 
>   pulls in the latest changes from the repository to your local master branch.
> 
> 2.a Rebasing your local branches:
> 
>     git pull --rebase
> 
>   fetches the changes from the main repository and replays your local commits
>   over it. This is useful to keep all your local changes at the top of your
>   tree.

a few words of the relation of these to "svn up" should be added


> 
> 
> 3. Adding/removing files/directories:
> 
>     git add [-A] <filename/dirname>
>     git rm [-r] <filename/dirname>
> 
>   GIT needs to get notified of all changes you make to your working
>   directory that makes files appear or disappear.

>   Line moves across files are automatically tracked.

Please mention that git is better at that when removial and addition are in the
same commit (that is IIRC)


[...]
> 9. Reverting broken commits
> 
>     git revert <commit>
> 
>   git revert will generate a revert commit. This will not make the faulty
>   commit disappear from the history.
> 
>     git reset <commit>
> 
>   git reset will uncommit the changes till <commit> rewriting the current
>   branch history.
> 
>     git commit --amend
> 
>   allows to amend the last commit details quickly.
> 
>     git rebase -i origin/master
> 
>   will replay local commits over the main repository allowing to edit,
>   merge or remove some of them in the process.
> 
>   Note that the reset, commit --amend and rebase rewrite history, so you
>   should use them ONLY on your local or topic branches.
> 

>   The main repository will reject those changes.

has this been verified?

[...]
--
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

No human being will ever know the Truth, for even if they happen to say it
by chance, they would not even known they had done so. -- Xenophanes
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/attachments/20101214/98e1d079/attachment.pgp>