diff options
Diffstat (limited to 'doc/git-howto.txt')
| -rw-r--r-- | doc/git-howto.txt | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/doc/git-howto.txt b/doc/git-howto.txt index 3ac21c87d9..72cde72eed 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 Libav-specific +What follows now is a basic introduction to Git and some FFmpeg-specific guidelines. Read it at least once, if you are granted commit privileges to the -Libav project you are expected to be familiar with these rules. +FFmpeg project you are expected to be familiar with these rules. @@ -44,13 +44,13 @@ I. BASICS: 1. Cloning the source tree: - git clone git://git.libav.org/libav.git <target> + git clone git://git.videolan.org/ffmpeg <target> - This will put the Libav sources into the directory <target>. + This will put the FFmpeg sources into the directory <target>. - git clone git@git.libav.org:libav.git <target> + git clone git@git.videolan.org:ffmpeg <target> - This will put the Libav sources into the directory <target> and let + This will put the FFmpeg 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 - Libav's master tree. The master tree will reject pushes with merge commits. + FFmpeg's master tree. The master tree will reject pushes with merge commits. 3. Adding/removing files/directories: @@ -97,7 +97,7 @@ I. BASICS: git log <filename(s)> You may also use the graphical tools like gitview or gitk or the web - interface available at http://git.libav.org/ + interface available at http://git.videolan.org 6. Checking source tree status: @@ -120,7 +120,7 @@ I. BASICS: For cosmetics-only commits you should get (almost) empty output from - git diff -wb <filename(s)> + git diff -w -b <filename(s)> Also check the output of @@ -255,5 +255,5 @@ I. BASICS: where $SHA1 is the commit SHA1 from the 'git log' output. -Contact the project admins <git at libav dot org> if you have technical +Contact the project admins <root at ffmpeg dot org> if you have technical problems with the GIT server. |