-
Notifications
You must be signed in to change notification settings - Fork 14k
Git cheatsheet
##Git Cheatsheet (survival level)
Here is a set of some of the most common things you'll need to do in your day-to-day workflow with Git.
Pro Tip 1: you can get man pages for any git command by inserting a hyphen. As in: "man git-fetch" or "man git-merge"
Pro Tip 2: install the cheat gem for a really long cheat sheet available in your terminal.
-
What branch am I on? Which files are modified, which are staged, which are untracked, etc?
git status
-
Get all new changes, and remote branch refs
git fetch
-
Do a git fetch and (if possible) a merge on the current branch
git pull
-
Push commits to to the origin/master (like an SVN commit):
git push origin master
-
Push commits on a non-master branch:
git push origin your_branch_name
-
See a list of local branches
git branch
-
Switch to an existing branch
git checkout existing_branch_name
-
Create a new branch and switch to it:
git checkout -b new_branch_name
-
Merge my working branch into master (from master):
git merge working_branch_name
-
Merge a large set of commits on a dev branch into master as one commit ("squash" commit):
git merge working_branch_name --squash
-
Get the changes that have happened to master branch since I made my working branch:
git rebase master
-
Temporarily clear my stage so I can switch to another branch ("stashing"):
git stash
-
Get my stashed stuff back:
git stash apply
-
See the log of commits:
git log
-
See what changes were made in a given commit:
git show COMMIT_HASH
-
See more detailed log information:
git whatchanged
-
Get rid of all the changes I've made since last commit:
git reset --hard
-
Get rid of the changes for just one file:
git checkout FILENAME
-
Make HEAD point to the state of the codebase as of 2 commits ago:
git checkout HEAD^^
-
Fix a conflict (w/ system's default graphical diff tool):
git mergetool
When using Git, it's very handy (read: pretty much mandatory) to have an ambient cue in your shell telling you what branch you're currently on. Use this function in your .profile/.bashrc/.bash_profile to enable you to place your Git branch in your prompt:
function parse_git_branch {
git branch --no-color 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/(\1)/'
}
- Home Welcome to Metasploit!
- Using Metasploit A collection of useful links for penetration testers.
-
Setting Up a Metasploit Development Environment From
apt-get install
togit push
. - CONTRIBUTING.md What should your contributions look like?
- Landing Pull Requests Working with other people's contributions.
- Using Git All about Git and GitHub.
- Contributing to Metasploit Be a part of our open source community.
- Meterpreter All about the Meterpreter payload.