Merge remote-tracking branch 'newdev/master'

[ffmpeg] / doc / git-howto.txt

diff --git a/doc/git-howto.txt b/doc/git-howto.txt
index 720f0d0008c37504b18092cf857998847e2708d0..72cde72eed75afcc9c394878094800328976474f 100644 (file)
--- a/doc/git-howto.txt
+++ b/doc/git-howto.txt
@@ -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
 
@@ -130,6 +130,11 @@ I. BASICS:
 
     git add [-i|-p|-A] <filenames/dirnames>
 
+  Make sure you have told git your name and email address, e.g. by running
+    git config --global user.name "My Name"
+    git config --global user.email my@email.invalid
+  (--global to set the global configuration for all your git checkouts).
+
   Git will select the changes to the files for commit. Optionally you can use
   the interactive or the patch mode to select hunk by hunk what should be
   added to the commit.
@@ -239,6 +244,16 @@ I. BASICS:
   will show the svn changeset r23456. With older git versions searching in
   the git log output is the easiest option (especially if a pager with
   search capabilities is used).
+  This commit can be checked out with
+
+    git checkout -b svn_23456 :/'as revision 23456'
+
+  or for git < 1.7.1 with
+
+    git checkout -b svn_23456 $SHA1
+
+  where $SHA1 is the commit SHA1 from the 'git log' output.
+
 
 Contact the project admins <root at ffmpeg dot org> if you have technical
 problems with the GIT server.