Setup<\/p>\n
-----\r\n\r\ngit clone <repo>\r\n clone the repository specified by <repo>; this is similar to \"checkout\" in\r\n some other version control systems such as Subversion and CVS\r\n\r\nAdd colors to your ~\/.gitconfig file:\r\n\r\n [color]\r\n ui = auto\r\n [color \"branch\"]\r\n current = yellow reverse\r\n local = yellow\r\n remote = green\r\n [color \"diff\"]\r\n meta = yellow bold\r\n frag = magenta bold\r\n old = red bold\r\n new = green bold\r\n [color \"status\"]\r\n added = yellow\r\n changed = green\r\n untracked = cyan\r\n\r\nHighlight whitespace in diffs\r\n\r\n [color]\r\n ui = true\r\n [color \"diff\"]\r\n whitespace = red reverse\r\n [core]\r\n whitespace=fix,-indent-with-non-tab,trailing-space,cr-at-eol\r\n\r\nAdd aliases to your ~\/.gitconfig file:\r\n\r\n [alias]\r\n st = status\r\n ci = commit\r\n br = branch\r\n co = checkout\r\n df = diff\r\n dc = diff --cached\r\n lg = log -p\r\n lol = log --graph --decorate --pretty=oneline --abbrev-commit\r\n lola = log --graph --decorate --pretty=oneline --abbrev-commit --all\r\n ls = ls-files\r\n\r\n # Show files ignored by git:\r\n ign = ls-files -o -i --exclude-standard\r\n\r\n\r\nConfiguration\r\n-------------\r\n\r\ngit config -e [--global]\r\n edit the .git\/config [or ~\/.gitconfig] file in your $EDITOR\r\n\r\ngit config --global user.name 'John Doe'\r\ngit config --global user.email johndoe@example.com\r\n sets your name and email for commit messages\r\n\r\ngit config branch.autosetupmerge true\r\n tells git-branch and git-checkout to setup new branches so that git-pull(1)\r\n will appropriately merge from that remote branch. Recommended. Without this,\r\n you will have to add --track to your branch command or manually merge remote\r\n tracking branches with \"fetch\" and then \"merge\".\r\n\r\ngit config core.autocrlf true\r\n This setting tells git to convert the newlines to the system's standard\r\n when checking out files, and to LF newlines when committing in\r\n\r\ngit config --list\r\n To view all options\r\n\r\ngit config apply.whitespace nowarn\r\n To ignore whitespace\r\n\r\nYou can add \"--global\" after \"git config\" to any of these commands to make it\r\napply to all git repos (writes to ~\/.gitconfig).\r\n\r\n\r\nInfo\r\n----\r\ngit reflog\r\n Use this to recover from *major* mess ups! It's basically a log of the\r\n last few actions and you might have luck and find old commits that\r\n have been lost by doing a complex merge.\r\n\r\ngit diff\r\n show a diff of the changes made since your last commit\r\n to diff one file: \"git diff -- <filename>\"\r\n to show a diff between staging area and HEAD: `git diff --cached`\r\n\r\ngit status\r\n show files added to the staging area, files with changes, and untracked files\r\n\r\ngit log\r\n show recent commits, most recent on top. Useful options:\r\n --color with color\r\n --graph with an ASCII-art commit graph on the left\r\n --decorate with branch and tag names on appropriate commits\r\n --stat with stats (files changed, insertions, and deletions)\r\n -p with full diffs\r\n --author=foo only by a certain author\r\n --after=\"MMM DD YYYY\" ex. (\"Jun 20 2008\") only commits after a certain date\r\n --before=\"MMM DD YYYY\" only commits that occur before a certain date\r\n --merge only the commits involved in the current merge conflicts\r\n\r\ngit log <ref>..<ref>\r\n show commits between the specified range. Useful for seeing changes from\r\n remotes:\r\n git log HEAD..origin\/master # after git remote update\r\n\r\ngit show <rev>\r\n show the changeset (diff) of a commit specified by <rev>, which can be any\r\n SHA1 commit ID, branch name, or tag (shows the last commit (HEAD) by default)\r\n\r\ngit show --name-only <rev>\r\n show only the names of the files that changed, no diff information.\r\n\r\ngit blame <file>\r\n show who authored each line in <file>\r\n\r\ngit blame <file> <rev>\r\n show who authored each line in <file> as of <rev> (allows blame to go back in\r\n time)\r\n\r\ngit gui blame\r\n really nice GUI interface to git blame\r\n\r\ngit whatchanged <file>\r\n show only the commits which affected <file> listing the most recent first\r\n E.g. view all changes made to a file on a branch:\r\n git whatchanged <branch> <file> | grep commit | \\\r\n colrm 1 7 | xargs -I % git show % <file>\r\n this could be combined with git remote show <remote> to find all changes on\r\n all branches to a particular file.\r\n\r\ngit diff <commit> head path\/to\/fubar\r\n show the diff between a file on the current branch and potentially another\r\n branch\r\n\r\ngit diff --cached [<file>]\r\n shows diff for staged (git-add'ed) files (which includes uncommitted git\r\n cherry-pick'ed files)\r\n\r\ngit ls-files\r\n list all files in the index and under version control.\r\n\r\ngit ls-remote <remote> [HEAD]\r\n show the current version on the remote repo. This can be used to check whether\r\n a local is required by comparing the local head revision.\r\n\r\nAdding \/ Deleting\r\n-----------------\r\n\r\ngit add <file1> <file2> ...\r\n add <file1>, <file2>, etc... to the project\r\n\r\ngit add <dir>\r\n add all files under directory <dir> to the project, including subdirectories\r\n\r\ngit add .\r\n add all files under the current directory to the project\r\n *WARNING*: including untracked files.\r\n\r\ngit rm <file1> <file2> ...\r\n remove <file1>, <file2>, etc... from the project\r\n\r\ngit rm $(git ls-files --deleted)\r\n remove all deleted files from the project\r\n\r\ngit rm --cached <file1> <file2> ...\r\n commits absence of <file1>, <file2>, etc... from the project\r\n\r\nIgnoring\r\n---------\r\n\r\nOption 1:\r\n\r\nEdit $GIT_DIR\/info\/exclude. See Environment Variables below for explanation on\r\n$GIT_DIR.\r\n\r\nOption 2:\r\n\r\nAdd a file .gitignore to the root of your project. This file will be checked in.\r\n\r\nEither way you need to add patterns to exclude to these files.\r\n\r\nStaging\r\n-------\r\n\r\ngit add <file1> <file2> ...\r\ngit stage <file1> <file2> ...\r\n add changes in <file1>, <file2> ... to the staging area (to be included in\r\n the next commit\r\n\r\ngit add -p\r\ngit stage --patch\r\n interactively walk through the current changes (hunks) in the working\r\n tree, and decide which changes to add to the staging area.\r\n\r\ngit add -i\r\ngit stage --interactive\r\n interactively add files\/changes to the staging area. For a simpler\r\n mode (no menu), try `git add --patch` (above)\r\n\r\nUnstaging\r\n---------\r\n\r\ngit reset HEAD <file1> <file2> ...\r\n remove the specified files from the next commit\r\n\r\n\r\nCommitting\r\n----------\r\n\r\ngit commit <file1> <file2> ... [-m <msg>]\r\n commit <file1>, <file2>, etc..., optionally using commit message <msg>,\r\n otherwise opening your editor to let you type a commit message\r\n\r\ngit commit -a\r\n commit all files changed since your last commit\r\n (does not include new (untracked) files)\r\n\r\ngit commit -v\r\n commit verbosely, i.e. includes the diff of the contents being committed in\r\n the commit message screen\r\n\r\ngit commit --amend\r\n edit the commit message of the most recent commit\r\n\r\ngit commit --amend <file1> <file2> ...\r\n redo previous commit, including changes made to <file1>, <file2>, etc...\r\n\r\n\r\nBranching\r\n---------\r\n\r\ngit branch\r\n list all local branches\r\n\r\ngit branch -r\r\n list all remote branches\r\n\r\ngit branch -a\r\n list all local and remote branches\r\n\r\ngit branch <branch>\r\n create a new branch named <branch>, referencing the same point in history as\r\n the current branch\r\n\r\ngit branch <branch> <start-point>\r\n create a new branch named <branch>, referencing <start-point>, which may be\r\n specified any way you like, including using a branch name or a tag name\r\n\r\ngit push <repo> <start-point>:refs\/heads\/<branch>\r\n create a new remote branch named <branch>, referencing <start-point> on the\r\n remote. Repo is the name of the remote.\r\n Example: git push origin origin:refs\/heads\/branch-1\r\n Example: git push origin origin\/branch-1:refs\/heads\/branch-2\r\n Example: git push origin branch-1 ## shortcut\r\n\r\ngit branch --track <branch> <remote-branch>\r\n create a tracking branch. Will push\/pull changes to\/from another repository.\r\n Example: git branch --track experimental origin\/experimental\r\n\r\ngit branch --set-upstream <branch> <remote-branch> (As of Git 1.7.0)\r\n Make an existing branch track a remote branch\r\n Example: git branch --set-upstream foo origin\/foo\r\n\r\ngit branch -d <branch>\r\n delete the branch <branch>; if the branch you are deleting points to a\r\n commit which is not reachable from the current branch, this command\r\n will fail with a warning.\r\n\r\ngit branch -r -d <remote-branch>\r\n delete a remote-tracking branch.\r\n Example: git branch -r -d wycats\/master\r\n\r\ngit branch -D <branch>\r\n even if the branch points to a commit not reachable from the current branch,\r\n you may know that that commit is still reachable from some other branch or\r\n tag. In that case it is safe to use this command to force git to delete the\r\n branch.\r\n\r\ngit checkout <branch>\r\n make the current branch <branch>, updating the working directory to reflect\r\n the version referenced by <branch>\r\n\r\ngit checkout -b <new> <start-point>\r\n create a new branch <new> referencing <start-point>, and check it out.\r\n\r\ngit push <repository> :<branch>\r\n removes a branch from a remote repository.\r\n Example: git push origin :old_branch_to_be_deleted\r\n\r\ngit co <branch> <path to new file>\r\n Checkout a file from another branch and add it to this branch. File\r\n will still need to be added to the git branch, but it's present.\r\n Eg. git co remote_at_origin__tick702_antifraud_blocking\r\n ....\/...nt_elements_for_iframe_blocked_page.rb\r\n\r\ngit show <branch> -- <path to file that does not exist>\r\n Eg. git show remote_tick702 -- path\/to\/fubar.txt\r\n show the contents of a file that was created on another branch and that\r\n does not exist on the current branch.\r\n\r\ngit show <rev>:<repo path to file>\r\n Show the contents of a file at the specific revision. Note: path has to be\r\n absolute within the repo.\r\n\r\nMerging\r\n-------\r\n\r\ngit merge <branch>\r\n merge branch <branch> into the current branch; this command is idempotent\r\n and can be run as many times as needed to keep the current branch\r\n up-to-date with changes in <branch>\r\n\r\ngit merge <branch> --no-commit\r\n merge branch <branch> into the current branch, but do not autocommit the\r\n result; allows you to make further tweaks\r\n\r\ngit merge <branch> -s ours\r\n merge branch <branch> into the current branch, but drops any changes in\r\n <branch>, using the current tree as the new tree\r\n\r\n\r\nCherry-Picking\r\n--------------\r\n\r\ngit cherry-pick [--edit] [-n] [-m parent-number] [-s] [-x] <commit>\r\n selectively merge a single commit from another local branch\r\n Example: git cherry-pick 7300a6130d9447e18a931e898b64eefedea19544\r\n\r\n\r\nSquashing\r\n---------\r\nWARNING: \"git rebase\" changes history. Be careful. Google it.\r\n\r\ngit rebase --interactive HEAD~10\r\n (then change all but the first \"pick\" to \"squash\")\r\n squash the last 10 commits into one big commit\r\n\r\n\r\nConflicts\r\n---------\r\n\r\ngit mergetool\r\n work through conflicted files by opening them in your mergetool (opendiff,\r\n kdiff3, etc.) and choosing left\/right chunks. The merged result is staged for\r\n commit.\r\n\r\nFor binary files or if mergetool won't do, resolve the conflict(s) manually\r\nand then do:\r\n\r\n git add <file1> [<file2> ...]\r\n\r\nOnce all conflicts are resolved and staged, commit the pending merge with:\r\n\r\n git commit\r\n\r\n\r\nSharing\r\n-------\r\n\r\ngit fetch <remote>\r\n update the remote-tracking branches for <remote> (defaults to \"origin\").\r\n Does not initiate a merge into the current branch (see \"git pull\" below).\r\n\r\ngit pull\r\n fetch changes from the server, and merge them into the current branch.\r\n Note: .git\/config must have a [branch \"some_name\"] section for the current\r\n branch, to know which remote-tracking branch to merge into the current\r\n branch. Git 1.5.3 and above adds this automatically.\r\n\r\ngit push\r\n update the server with your commits across all branches that are *COMMON*\r\n between your local copy and the server. Local branches that were never\r\n pushed to the server in the first place are not shared.\r\n\r\ngit push origin <branch>\r\n update the server with your commits made to <branch> since your last push.\r\n This is always *required* for new branches that you wish to share. After\r\n the first explicit push, \"git push\" by itself is sufficient.\r\n\r\ngit push origin <branch>:refs\/heads\/<branch>\r\n E.g. git push origin twitter-experiment:refs\/heads\/twitter-experiment\r\n Which, in fact, is the same as git push origin <branch> but a little\r\n more obvious what is happening.\r\n\r\nReverting\r\n---------\r\n\r\ngit revert <rev>\r\n reverse commit specified by <rev> and commit the result. This does *not* do\r\n the same thing as similarly named commands in other VCS's such as \"svn\r\n revert\" or \"bzr revert\", see below\r\n\r\ngit checkout <file>\r\n re-checkout <file>, overwriting any local changes\r\n\r\ngit checkout .\r\n re-checkout all files, overwriting any local changes. This is most similar\r\n to \"svn revert\" if you're used to Subversion commands\r\n\r\n\r\nFix mistakes \/ Undo\r\n-------------------\r\n\r\ngit reset --hard\r\n abandon everything since your last commit; this command can be DANGEROUS.\r\n If merging has resulted in conflicts and you'd like to just forget about\r\n the merge, this command will do that.\r\n\r\ngit reset --hard ORIG_HEAD or git reset --hard origin\/master \r\n undo your most recent *successful* merge *and* any changes that occurred\r\n after. Useful for forgetting about the merge you just did. If there are\r\n conflicts (the merge was not successful), use \"git reset --hard\" (above)\r\n instead.\r\n\r\ngit reset --soft HEAD^\r\n forgot something in your last commit? That's easy to fix. Undo your last\r\n commit, but keep the changes in the staging area for editing.\r\n\r\ngit commit --amend\r\n redo previous commit, including changes you've staged in the meantime.\r\n Also used to edit commit message of previous commit.\r\n\r\n\r\nPlumbing\r\n--------\r\n\r\ntest <sha1-A> = $(git merge-base <sha1-A> <sha1-B>)\r\n determine if merging sha1-B into sha1-A is achievable as a fast forward;\r\n non-zero exit status is false.\r\n\r\n\r\nStashing\r\n--------\r\n\r\ngit stash\r\ngit stash save <optional-name>\r\n save your local modifications to a new stash (so you can for example\r\n \"git svn rebase\" or \"git pull\")\r\n\r\ngit stash apply\r\n restore the changes recorded in the stash on top of the current working tree\r\n state\r\n\r\ngit stash pop\r\n restore the changes from the most recent stash, and remove it from the stack\r\n of stashed changes\r\n\r\ngit stash list\r\n list all current stashes\r\n\r\ngit stash show <stash-name> -p\r\n show the contents of a stash - accepts all diff args\r\n\r\ngit stash drop [<stash-name>]\r\n delete the stash\r\n\r\ngit stash clear\r\n delete all current stashes\r\n\r\n\r\nRemotes\r\n-------\r\n\r\ngit remote add <remote> <remote_URL>\r\n adds a remote repository to your git config. Can be then fetched locally.\r\n Example:\r\n git remote add coreteam git:\/\/github.com\/wycats\/merb-plugins.git\r\n git fetch coreteam\r\n\r\ngit push <remote> :refs\/heads\/<branch>\r\n delete a branch in a remote repository\r\n\r\ngit push <remote> <remote>:refs\/heads\/<remote_branch>\r\n create a branch on a remote repository\r\n Example: git push origin origin:refs\/heads\/new_feature_name\r\n\r\ngit push <repository> +<remote>:<new_remote>\r\n replace a <remote> branch with <new_remote>\r\n think twice before do this\r\n Example: git push origin +master:my_branch\r\n\r\ngit remote prune <remote>\r\n prune deleted remote-tracking branches from \"git branch -r\" listing\r\n\r\ngit remote add -t master -m master origin git:\/\/example.com\/git.git\/\r\n add a remote and track its master\r\n\r\ngit remote show <remote>\r\n show information about the remote server.\r\n\r\ngit checkout -b <local branch> <remote>\/<remote branch>\r\n Eg git checkout -b myfeature origin\/myfeature\r\n Track a remote branch as a local branch.\r\n\r\ngit pull <remote> <branch>\r\ngit push\r\n For branches that are remotely tracked (via git push) but\r\n that complain about non-fast forward commits when doing a\r\n git push. The pull synchronizes local and remote, and if\r\n all goes well, the result is pushable.\r\n\r\ngit fetch <remote>\r\n Retrieves all branches from the remote repository. After\r\n this 'git branch --track ...' can be used to track a branch\r\n from the new remote.\r\n\r\nSubmodules\r\n----------\r\n\r\ngit submodule add <remote_repository> <path\/to\/submodule>\r\n add the given repository at the given path. The addition will be part of the\r\n next commit.\r\n\r\ngit submodule update [--init]\r\n Update the registered submodules (clone missing submodules, and checkout\r\n the commit specified by the super-repo). --init is needed the first time.\r\n\r\ngit submodule foreach <command>\r\n Executes the given command within each checked out submodule.\r\n\r\nRemoving submodules\r\n\r\n 1. Delete the relevant line from the .gitmodules file.\r\n 2. Delete the relevant section from .git\/config.\r\n 3. Run git rm --cached path_to_submodule (no trailing slash).\r\n 4. Commit and delete the now untracked submodule files.\r\n\r\nUpdating submodules\r\n To update a submodule to a new commit:\r\n 1. update submodule:\r\n cd <path to submodule>\r\n git pull\r\n 2. commit the new version of submodule:\r\n cd <path to toplevel>\r\n git commit -m \"update submodule version\"\r\n 3. check that the submodule has the correct version\r\n git submodule status\r\n If the update in the submodule is not committed in the\r\n main repository, it is lost and doing git submodule\r\n update will revert to the previous version.\r\n\r\nPatches\r\n-------\r\n\r\ngit format-patch HEAD^\r\n Generate the last commit as a patch that can be applied on another\r\n clone (or branch) using 'git am'. Format patch can also generate a\r\n patch for all commits using 'git format-patch HEAD^ HEAD'\r\n All page files will be enumerated with a prefix, e.g. 0001 is the\r\n first patch.\r\n\r\ngit format-patch <Revision>^..<Revision>\r\n Generate a patch for a single commit. E.g.\r\n git format-patch d8efce43099^..d8efce43099\r\n Revision does not need to be fully specified.\r\n\r\ngit am <patch file>\r\n Applies the patch file generated by format-patch.\r\n\r\ngit diff --no-prefix > patchfile\r\n Generates a patch file that can be applied using patch:\r\n patch -p0 < patchfile\r\n Useful for sharing changes without generating a git commit.\r\n\r\nTags\r\n----\r\n\r\ngit tag -l\r\n Will list all tags defined in the repository.\r\n\r\ngit co <tag_name>\r\n Will checkout the code for a particular tag. After this you'll\r\n probably want to do: 'git co -b <some branch name>' to define\r\n a branch. Any changes you now make can be committed to that\r\n branch and later merged.\r\n\r\nArchive\r\n-------\r\n\r\ngit archive master | tar -x -C \/somewhere\/else\r\n Will export expanded tree as tar archive at given path\r\n\r\ngit archive master | bzip2 > source-tree.tar.bz2\r\n Will export archive as bz2\r\n\r\ngit archive --format zip --output \/full\/path master\r\n Will export as zip\r\n\r\nGit Instaweb\r\n------------\r\n\r\ngit instaweb --httpd=webrick [--start | --stop | --restart]\r\n\r\n\r\nEnvironment Variables\r\n---------------------\r\n\r\nGIT_AUTHOR_NAME, GIT_COMMITTER_NAME\r\n Your full name to be recorded in any newly created commits. Overrides\r\n user.name in .git\/config\r\n\r\nGIT_AUTHOR_EMAIL, GIT_COMMITTER_EMAIL\r\n Your email address to be recorded in any newly created commits. Overrides\r\n user.email in .git\/config\r\n\r\nGIT_DIR\r\n Location of the repository to use (for out of working directory repositories)\r\n\r\nGIT_WORKING_TREE\r\n Location of the Working Directory - use with GIT_DIR to specifiy the working\r\n directory root\r\n or to work without being in the working directory at all.\r\n\r\nref: http:\/\/pegmanm.tumblr.com\/post\/13722249878\/git-cheat-sheet<\/pre>\n","protected":false},"excerpt":{"rendered":"Git Cheat Sheet Setup —– git clone <repo> clone the repository specified by <repo>; this…<\/p>\n