4 ms·

1) Pull creates a merge commit. Why? 2) What's a fast forward? 3) What's a tracking branch?

• somebehemoth 12y ago
  1) So you can revert the merge very easily. 2) Merging without a commit. 3) A branch on a remote server that you have a copy of locally and you want to keep track of the status of remote against the local copy (who's behind and who is ahead?). This is my basic understanding in terms of how I use git. I like Mercurial too and don't have a horse in this race.
  • mpdehaan2 12y ago
    While this somewhat underscores some complexity in git, here's something I wrote trying to explain to others why and how to avoid those merge commits: http://michaeldehaan.net/post/116465000577/understanding-when-to-use-git-rebase http://michaeldehaan.net/post/116465000577/understanding-whe...
• Touche 12y ago
  You don't need to know any of these things to get along fine.