Merge remote-tracking branch 'qatar/master'

[ffmpeg] / doc / git-howto.txt

diff --git a/doc/git-howto.txt b/doc/git-howto.txt
index 72cde72eed75afcc9c394878094800328976474f..5ba72eeeb9ebf3606ed0f99595bf23f63ca154f3 100644 (file)
--- a/doc/git-howto.txt
+++ b/doc/git-howto.txt
@@ -39,16 +39,17 @@ I. BASICS:
 
 0. Get GIT:
 
+  Most distributions have a git package, if not
   You can get git from http://git-scm.com/
 
 
 1. Cloning the source tree:
 
-    git clone git://git.videolan.org/ffmpeg <target>
+    git clone git://source.ffmpeg.org/ffmpeg <target>
 
   This will put the FFmpeg sources into the directory <target>.
 
-    git clone git@git.videolan.org:ffmpeg <target>
+    git clone git@source.ffmpeg.org:ffmpeg <target>
 
   This will put the FFmpeg sources into the directory <target> and let
   you push back your changes to the remote repository.
@@ -97,7 +98,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.videolan.org
+  interface available at http://source.ffmpeg.org
 
 6. Checking source tree status:
 
@@ -205,8 +206,19 @@ I. BASICS:
 
     git format-patch <commit> [-o directory]
 
-  will generate a set of patches out of the current branch starting from
-  commit. By default the patches are created in the current directory.
+  will generate a set of patches for each commit between <commit> and
+  current HEAD. E.g.
+
+    git format-patch origin/master
+
+  will generate patches for all commits on current branch which are not
+  present in upstream.
+  A useful shortcut is also
+
+    git format-patch -n
+
+  which will generate patches from last n commits.
+  By default the patches are created in the current directory.
 
 11. Sending patches for review
 
@@ -215,6 +227,8 @@ I. BASICS:
   will send the patches created by git format-patch or directly generates
   them. All the email fields can be configured in the global/local
   configuration or overridden by command line.
+  Note that this tool must often be installed separately (e.g. git-email
+  package on Debian-based distros).
 
 12. Pushing changes to remote trees