diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-17 16:53:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-17 17:22:52 +0100 |
| commit | 0fecf2642b9d909820683647c70031a954f5e58d (patch) | |
| tree | 36ca02de9fa27a049829fb589517223d2d0ce5f5 /doc/git-howto.txt | |
| parent | e309fdc7018a1027d187ec27fb1d69a41a4ee167 (diff) | |
| parent | f1f60f5252b0b448adcce0c1c52f3161ee69b9bf (diff) | |
| download | ffmpeg-0fecf2642b9d909820683647c70031a954f5e58d.tar.gz | |
Merge remote-tracking branch 'newdev/master'
Conflicts:
Changelog
doc/APIchanges
doc/optimization.txt
libavformat/avio.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/git-howto.txt')
| -rw-r--r-- | doc/git-howto.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/git-howto.txt b/doc/git-howto.txt index 8b1fc14149..65eed426fe 100644 --- a/doc/git-howto.txt +++ b/doc/git-howto.txt @@ -28,9 +28,9 @@ Consult these resources whenever you have problems, they are quite exhaustive. You do not need a special username or password. All you need is to provide a ssh public key to the Git server admin. -What follows now is a basic introduction to Git and some FFmpeg-specific +What follows now is a basic introduction to Git and some Libav-specific guidelines. Read it at least once, if you are granted commit privileges to the -FFmpeg project you are expected to be familiar with these rules. +Libav project you are expected to be familiar with these rules. @@ -46,11 +46,11 @@ I. BASICS: git clone git://git.videolan.org/ffmpeg <target> - This will put the FFmpeg sources into the directory <target>. + This will put the Libav sources into the directory <target>. git clone git@git.videolan.org:ffmpeg <target> - This will put the FFmpeg sources into the directory <target> and let + This will put the Libav sources into the directory <target> and let you push back your changes to the remote repository. @@ -72,7 +72,7 @@ I. BASICS: fetches the changes from the main repository and replays your local commits over it. This is required to keep all your local changes at the top of - FFmpeg's master tree. The master tree will reject pushes with merge commits. + Libav's master tree. The master tree will reject pushes with merge commits. 3. Adding/removing files/directories: |