Git is version control for just about anything you write on the computer. Since we're all developers, we'll mainly use it with respect to code.
What is Version Control?
Version control records changes to files over time. This allows us to take "snapshots" of our code at opportune times (when a feature is finally working, for instance). We can create various versions of our code. For instance, it is common for developers to have a 'master' version of their code and to write different features in separate 'branches' (separate version of code). This gives us the power to experiment with new features while keeping our 'master' version intact.
Why use Git?
- It's easy to install.
- It's widely used in the development community.
- It's open-source.
- It lends itself nicely to collaboration.
Common Git Commands
Identify Yourself
git config --global user.name "John Doe"
git config --global user.email [email protected]
Initialize a git repository
git init [directory]
Initializes a git repository in [directory]. If [directory] is not specified, a new git repository is created in the current directory.
Add files to be staged
git add [<path>]
Stage all (git add .) or some files (git add this_file.txt) in directory.
Make a commit
git commit [-m <msg>]
Amend the Previous Commit
git add <path-to-files-or-folder>
git commit --amend
Enter the commands above after fixing (and saving) the necessary files.
Create a New Branch
git branch <new-branch-name>
Delete a Branch
git branch -d <branch-name>
Note: This will only work if the branch has been fully merged into its upstream branch (usually master).
Go to an Existing Branch
git checkout <branch-name>
Create (and go to) New Branch
git checkout -b <branch-name>
Creates and goes to a branch of branch-name.
Important: Remember to run this command while in the branch you want to branch from.
For example, if you want a branch that start off looking like the master branch (common), create the new branch off the master branch.
Merge Branches
git merge <branch-name>
Note: HEAD must point to (you must be on) the branch you want to merge into.