Revision ffe9fd25

View differences:

doc/git-howto.txt
56 56

  
57 57
2. Updating the source tree to the latest revision:
58 58

  
59
    git pull
59
    git pull (--ff-only)
60 60

  
61
  pulls in the latest changes from the repository to your local master branch.
61
  pulls in the latest changes from the tracked branch. The tracked branch
62
  can be remote. By default the master branch tracks the branch master in
63
  the remote origin.
64
  Caveat: Since merge commits are forbidden at least for the initial
65
          months of git --ff-only or --rebase (see below) are recommended.
66
          --ff-only will fail and not create merge commits if your branch
67
          has diverged (has a different history) from the tracked branch.
62 68

  
63 69
2.a Rebasing your local branches:
64 70

  
65 71
    git pull --rebase
66 72

  
67 73
  fetches the changes from the main repository and replays your local commits
68
  over it. This is useful to keep all your local changes at the top of your
69
  tree.
74
  over it. This is required to keep all your local changes at the top of
75
  FFmpeg's master tree. The master tree will reject pushes with merge commits.
70 76

  
71 77

  
72 78
3. Adding/removing files/directories:

Also available in: Unified diff