[FFmpeg-devel] Git switch is ready to go!

Janne Grunau janne-ffmpeg
Mon Jan 17 09:29:14 CET 2011

On Fri, Jan 14, 2011 at 11:12:23PM +0100, Michael Niedermayer wrote:
> On Fri, Jan 14, 2011 at 11:00:45PM +0100, Jean-Baptiste Kempf wrote:
> > On Fri, Jan 14, 2011 at 10:58:27PM +0100, Michael Niedermayer wrote :
> > > Also just to confirm
> > > * The svnlog mailinglist will receive unabrevated commit diffs?
> > Yes, the update hook is in place.
> > 
> > > * The repository will refuse non fast forward pushes?
> > Yes, the update hook refuses non fast forward pushes.
> Good then iam fine with making SVN read only now if someone checks in the latest
> version of our git-howto (id do it but iam not sure which is the latest version)
> and makes sure that the rebase/merge thing is
> documented in it because as is i think people could with these commands end up
> easily with merges they cannot push. That is unless iam silly

git howto is committed, I still have following patch

Index: doc/git-howto.txt
--- doc/git-howto.txt   (revision 26397)
+++ doc/git-howto.txt   (working copy)
@@ -56,17 +56,23 @@
 2. Updating the source tree to the latest revision:
-    git pull
+    git pull (--ff-only)
-  pulls in the latest changes from the repository to your local master branch.
+  pulls in the latest changes from the tracked branch. The tracked branch
+  can be remote. By default the master branch tracks the branch master in
+  the remote origin.
+  Caveat: Since merge commits are forbidden at least for the initial
+          months of git --ff-only or --rebase (see below) are recommended.
+         --ff-only will fail and not create merge commits if your branch
+         has diverged (has a different history) from the tracked branch.
 2.a Rebasing your local branches:
     git pull --rebase
   fetches the changes from the main repository and replays your local commits
-  over it. This is useful to keep all your local changes at the top of your
-  tree.
+  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.
 3. Adding/removing files/directories:

More information about the ffmpeg-devel mailing list