diff options
| author | Janne Grunau <janne-ffmpeg@jannau.net> | 2011-01-17 10:02:53 +0000 |
|---|---|---|
| committer | Janne Grunau <janne-ffmpeg@jannau.net> | 2011-01-17 10:02:53 +0000 |
| commit | ffe9fd253f21db43ccc52a4043af94b7b9044f53 (patch) | |
| tree | a94bde99dcdde9d7c3af3179f1869381775096c2 /doc | |
| parent | 3a45a3f3c1fbb415dbba5ad047be054f57ce13e0 (diff) | |
| download | ffmpeg-ffe9fd253f21db43ccc52a4043af94b7b9044f53.tar.gz | |
rewrite git-howto for the no merge policy
Originally committed as revision 26400 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/git-howto.txt | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/doc/git-howto.txt b/doc/git-howto.txt index 0b847eefd1..720f0d0008 100644 --- a/doc/git-howto.txt +++ b/doc/git-howto.txt @@ -56,17 +56,23 @@ I. BASICS: 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: |