Ok, after seeing this post by PJ Hyettthis post by PJ Hyett, I have decided to skip to the end and go with Git.
- How to install GitHow to install Git
- How do you set up Git? Try to cover Linux, Windows, Mac, think 'client/server' mindset.
- How do you create a new project/repository?How do you create a new project/repository?
- How do you configure it to ignore files (.obj, .user, etc) that are not really part of the codebase?How do you configure it to ignore files (.obj, .user, etc) that are not really part of the codebase?
- How do you get the latest code?How do you get the latest code?
- How do you check out code?How do you check out code?
- How do you commit changes?How do you commit changes?
- How do you see what's uncommitted, or the status of your current codebase?How do you see what's uncommitted, or the status of your current codebase?
- How do you destroy unwanted commits?How do you destroy unwanted commits?
- How do you compare two revisions of a file, or your current file and a previous revision?How do you compare two revisions of a file, or your current file and a previous revision?
- How do you see the history of revisions to a file?How do you see the history of revisions to a file?
- How do you handle binary files (visio docs, for instance, or compiler environments)?
- How do you merge files changed at the "same time"?
- How do you undo (revert or reset) a commit?How do you undo (revert or reset) a commit?
- How do you 'mark' 'tag' or 'release' a particular set of revisions for a particular set of files so you can always pull that one later?How do you 'mark' 'tag' or 'release' a particular set of revisions for a particular set of files so you can always pull that one later?
- How do you pull a particular 'release'?
- How do you branch?How do you branch?
- How do you merge branches?How do you merge branches?
- How do you resolve conflicts and complete the merge?
- How do you merge parts of one branch into another branch?
- What is rebasing?What is rebasing?
- How do I track remote branches?How do I track remote branches?
- How can I create a branch on a remote repository?How can I create a branch on a remote repository?
- How do I delete a branch on a remote repository?How do I delete a branch on a remote repository?
- Git workflow examplesGit workflow examples
- Describe and link to a good GUI, IDE plugin, etc. that makes Git a non-command line resource, but please list its limitations as well as its good.
- msysgitmsysgit - Cross platform, included with Git
- gitkgitk - Cross platform history viewer, included with Git
- gitnubgitnub - Mac OS X
- gitxgitx - Mac OS X history viewer
- smartgitsmartgit - Cross platform, commercial, beta
- tigtig - console GUI for Linux
- qgitqgit - GUI for Windows, Linux
- Git ExtensionsGit Extensions - package for Windows, includes friendly GUI
- Any other common tasks a beginner should know?
- How do I work effectively with a subversion repository set as my source control source?
