aboutsummaryrefslogtreecommitdiffstats
path: root/doc/git-howto.txt
diff options
context:
space:
mode:
authorJanne Grunau <janne-ffmpeg@jannau.net>2011-03-14 22:59:19 +0100
committerJanne Grunau <janne-libav@jannau.net>2011-03-16 22:01:01 +0100
commitf8a45fa1b1764b34d4263eacd93411e8ba0484a4 (patch)
treea5d27f5c5f38dd6fc28ce2f40b2748b09bd6a5dd /doc/git-howto.txt
parenta03be6e1ba4cbf9984b0bbdb674704bbb2da6713 (diff)
downloadffmpeg-f8a45fa1b1764b34d4263eacd93411e8ba0484a4.tar.gz
replace FFmpeg with Libav in doc/
unless it stands for ffmpeg the program or is historic
Diffstat (limited to 'doc/git-howto.txt')
-rw-r--r--doc/git-howto.txt10
1 files changed, 5 insertions, 5 deletions
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 <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.libav.org:libav.git <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: