Creating a new repository
$ mkdir project $ cd project $ git init $ git remote add origin git@github.com:yourlogin/your-repo.git $ git add . $ git commit -am “new repository” $ git push -u origin master
Cloning existing repository
$ git clone https://github.com/username/your-repo.git
Creating branch
$ git checkout -b feature-1
# you are now in a branch, you can edit and create new files
$ git add .
$ git commit -am “new feature”
Merging branch to master
$ git checkout master
$ git merge feature-1
$ git push
Deleting branch
$ git branch -d feature-x
List all branches
$ git branch -a
Switch branch
$ git checkout feature-x
Switch to master branch
$ git checkout master
Listing Remote repositories
$ git remote -v
Replacing remote repository
# in case your remote repository changes, or you want to switch from HTTPS->SSH or SSH->HTTPS
$ git remote remove origin
$ git remote add origin git@github.com:yourlogin/your-repo.git
CONFIGURE TOOLING
Configure user information for all local repositories
Sets the name you want atached to your commit transactions:
$ git config --global user.name "[name]"
Sets the email you want atached to your commit transactions:
$ git config --global user.email "[email address]"
Enables helpful colorization of command line output:
$ git config --global color.ui auto
CREATE REPOSITORIES
Start a new repository or obtain one from an existing URL
Creates a new local repository with the specified name:
$ git init [project-name]
Downloads a project and its entire version history:
$ git clone [url]
MAKE CHANGES
Review edits and craf a commit transaction
Lists all new or modified files to be committed:
$ git status
Snapshots the file in preparation for versioning:
$ git add [file]
Unstages the file, but preserve its contents:
$ git reset [file]
Shows file differences not yet staged:
$ git diff
Shows file differences between staging and the last file version:
$ git diff --staged
Records file snapshots permanently in version history:
$ git commit -m "[descriptive message]"
GROUP CHANGES
Name a series of commits and combine completed efforts
Lists all local branches in the current repository:
$ git branch
Creates a new branch:
$ git branch [branch-name]
Switches to the specified branch and updates the working directory:
$ git checkout [branch-name]
Combines the specified branch’s history into the current branch:
$ git merge [branch]
Deletes the specified branch:
$ git branch -d [branch-name]
REFACTOR FILENAMES
Relocate and remove versioned files
Deletes the file from the working directory and stages the deletion:
$ git rm [file]
Removes the file from version control but preserves the file locally:
$ git rm --cached [file]
Changes the file name and prepares it for commit:
$ git mv [file-original] [file-renamed]
SUPPRESS TRACKING
Exclude temporary files and paths
Lists all ignored files in this project:
$ git ls-files --other --ignored --exclude-standard
.log
build/
temp-
A text file named .gitignore suppresses accidental versioning of
files and paths matching the specified patterns
SAVE FRAGMENTS
Shelve and restore incomplete changes
Temporarily stores all modified tracked files:
$ git stash
Lists all stashed change sets:
$ git stash list
Restores the most recently stashed files:
$ git stash pop
Discards the most recently stashed change set:
$ git stash drop
REVIEW HISTORY
Browse and inspect the evolution of project files
Lists version history for the current branch:
$ git log
Lists version history for a file, including renames:
$ git log --follow [file]
Shows content differences between two branches:
$ git diff [first-branch]...[second-branch]
Outputs metadata and content changes of the specified commit:
$ git show [commit]
REDO COMMITS
Erase mistakes and craf replacement history
Undoes all commits afer [commit], preserving changes locally:
$ git reset [commit]
Discards all history and changes back to the specified commit:
$ git reset --hard [commit]
SYNCHRONIZE CHANGES
Register a repository bookmark and exchange version history
Downloads all history from the repository bookmark:
$ git fetch [bookmark]
Combines bookmark’s branch into current local branch:
$ git merge [bookmark]/[branch]
Uploads all local branch commits to GitHub:
$ git push [alias] [branch]
Downloads bookmark history and incorporates changes:
$ git pull
More resources
git commands: https://www.atlassian.com/git/tutorials/comparing-workflows/
git flow: http://danielkummer.github.io/git-flow-cheatsheet/