From f8a45fa1b1764b34d4263eacd93411e8ba0484a4 Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Mon, 14 Mar 2011 22:59:19 +0100 Subject: replace FFmpeg with Libav in doc/ unless it stands for ffmpeg the program or is historic --- doc/git-howto.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'doc/git-howto.txt') diff --git a/doc/git-howto.txt b/doc/git-howto.txt index c6cbc2b668..3ac21c87d9 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.libav.org/libav.git - This will put the FFmpeg sources into the directory . + This will put the Libav sources into the directory . git clone git@git.libav.org:libav.git - This will put the FFmpeg sources into the directory and let + This will put the Libav sources into the directory 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: -- cgit v1.2.3