Git Cheat Sheet

<h3>Git principles</h3> <a href="http://eagain.net/articles/git-for-computer-scientists/" title="lots of pictures">Git for computer scientists.</a> <a href="http://www.kernel.org/pub/software/scm/git/docs/user-manual.html">Git user’s manual</a> <a href="http://www-cs-students.stanford.edu/~blynn/gitmagic/">Git Magic</a> <h3>Zach Rusin’s <a href="http://zrusin.blogspot.com/2007/09/git-cheat-sheet.html">Git Cheat Sheet</a></h3> The SVG is at: <ul> <li><a href="http://ktown.kde.org/~zrusin/git/git-cheat-sheet.svg">http://ktown.kde.org/~zrusin/git/git-cheat-sheet.svg</a></li> </ul> Sample png’s are here: <ul> <li><a href="http://ktown.kde.org/~zrusin/git/git-cheat-sheet-medium.png">http://ktown.kde.org/~zrusin/git/git-cheat-sheet-medium.png</a></li> <li><a href="http://ktown.kde.org/~zrusin/git/git-cheat-sheet-large.png">http://ktown.kde.org/~zrusin/git/git-cheat-sheet-large.png</a></li> </ul> <h3>cheat.errtheblog.com</h3> <ul> <li><a href="http://cheat.errtheblog.com/s/git/">http://cheat.errtheblog.com/s/git/</a></li> <li><a href="http://cheat.errtheblog.com/s/git_usage/">http://cheat.errtheblog.com/s/git_usage/</a></li> <li><a href="http://cheat.errtheblog.com/s/gitsvn/">http://cheat.errtheblog.com/s/gitsvn/</a></li> </ul> <h2>A Practical Git GUIDE</h2> (credit: notes extracted from GIT screencast at http://www.peepcode.com.) <h3>CONFIGURE</h3> identify yourself to git: email and your name <code>git config --global user.name "David Beckwith"</code> <code>git config --global user.email "dbitsolutions</code><code>@gmail.com"</code> To view all options: <code>git config --list</code> OR <code>cat .git/config</code> <h4>SET UP ALIASES</h4> <code>git config --global alias.co checkout</code> <h4>VIEW YOUR CONFIGURATION</h4> <code>cat .gitconfig</code> <h4>TO IGNORE WHITESPACE (Ruby is whitespace insensitive)</h4> <code>git config --global apply.whitespace nowarn</code> Some nice aliases: gb = git branch gba = git branch -a gc = git commit -v gd = git diff | mate gl = git pull gp = git push gst = git status <h3>START USING GIT</h3> <code>git init</code> <h4>TO IGNORE SOME FILES</h4> Add a file in the root directory called .gitignore and add some files to it: (comments begin with hash) *.log db/schema.rb db/schema.sql Git automatically ignores empty directories. If you want to have a <code>log/</code> directory, but want to ignore all the files in it, add the following lines to the root <code>.gitignore</code>: (lines beginning with ‘!’ are exceptions) <code>log/*</code> <code>!.gitignore</code> Then add an empty <code>.gitignore</code> in the empty directory: <code>touch log/.gitignore</code> <h4>TO SCHEDULE THE ADDITION OF ALL FILES TO THE NEXT COMMIT</h4> <code>git add .</code> <h4>TO SEE THE STATUS</h4> <code>git status</code> <h4>TO COMMIT</h4> <code>git commit -m "First import"</code> <h4>TO SEE WHAT HAS BEEN COMMITTED</h4> <code>git ls-files</code> <h4>TO SCHEDULE DELETION OF A FILE</h4> <code>git rm [file name]</code> <h4>TO COMMIT ALL CHANGES IN FILES IN THE CURRENT REPOSITORY</h4> <code>git commit -a</code> <h4>TO SCHEDULE THE ADDITION OF AN INDIVIDUAL FILE TO THE NEXT COMMIT</h4> <code>git add [file name]</code> <h4>TO VIEW THE DIFFERENCE AS YOU COMMIT USE THE -v OPTION</h4> <code>git commit -v</code> <h4>TO COMMIT AND TYPE THE MESSAGE ON THE COMMAND LINE USE THE -m OPTION</h4> <code>git commit -m "This is the message describing the commit"</code> <h4>TO COMMIT AND GET AUTOMATICALLY ANY CHANGES FROM OTHER PEOPLE USE THE -a OPTION</h4> <code>git commit -a</code> <h4>THE NORMAL COMMIT COMMAND:</h4> <code>git commit -a -v</code> <h4>TO VIEW A LOG OF YOUR COMMITS</h4> <code>git log</code> <h4>TO VIEW A LOG OF YOUR COMMITS WITH A GRAPH TO SHOW THE EXTENT OF THE CHANGES</h4> <code>git log --stat</code> <h4>TO HAVE PAGINATION WHEN VIEWING THE LOG FILE USE THE -v OPTION</h4> <code>git log -v</code> <h4>TO VISUALIZE YOUR CHANGES</h4> <code>gitk --all</code> <h4>TO CREATE A NEW TAG AND PUSH IT ON THE REMOTE BRANCH</h4> <code>git tag "v1.3"</code> <code>git push --tags</code> <h4>TO CREATE A NEW BRANCH</h4> <code>git branch [name of your new branch]</code> <h4>TO PUSH THE NEW BRANCH TO A REMOTE REPOSITORY</h4> <code>git push origin [new-remote]</code> <h4>TO PULL A NEW BRANCH FROM A REMOTE REPOSITORY</h4> <code>git fetch origin [remote-branch]:[new-local-branch]</code> <h4>TO VIEW ALL OF THE EXISTING BRANCHES</h4> <code>git branch</code> <h4>TO VIEW A LIST OF ALL BRANCHES</h4> <code>git branch -a</code> <h4>TO SWITCH TO ANOTHER BRANCH</h4> The state of your file system will change after executing this command. <code>git checkout [name of the branch you want to switch to]</code> OR <code>git co [name of the branch you want to switch to]</code> <h4>TO MAKE SURE THAT YOUR NEW BRANCH GETS CHANGES FROM THE MASTER BRANCH (WHERE EVERYBODY ELSE IS WORKING) USE THE REBASE COMMAND</h4> <code>git rebase master</code> <h4>TO MERGE YOUR NEW BRANCH INTO THE MASTER BRANCH</h4> First, switch back to the master branch: <code>git co master</code> Check to see what changes you’re about to merge together, compare the two branches: <code>git diff master xyz</code> If you’re in a branch that’s not the <code>xyz</code> branch and want to merge the <code>xyz</code> branch into it: <code>git merge xyz</code> <h4>TO REVERT YOUR CHANGES to before the merge.</h4> <code>git reset --hard ORIG_HEAD</code> <h4>TO RESOLVE CONFLICTS just edit your file.</h4> Remove the markings, add the file, then commit. <h4>TO CREATE A BRANCH AND SWITCH TO THE BRANCH IN ONE MOVE:</h4> <code>git checkout -b [name of new branch]</code> <h4>TO CREATE A “CLIPBOARD” or “STASH” OF CHANGES THAT ARE NOT YET COMMITED (SO THAT YOU CAN SWITCH TO ANOTHER BRANCH IN THE MIDDLE OF YOUR CHANGES.), CREATE A STASH.</h4> <code>git stash "Put a message here to remind you of what you're saving to the clipboard"</code> <h4>TO SWITCH AWAY FROM THE CURRENT BRANCH</h4> <code>git co [branch you want to switch to]</code> Do whatever Then switch back to the stashed branch <code>git co [the stashed branch]</code> <h4>TO VIEW THE LIST OF STASHES</h4> <code>git stash list</code> <h4>TO LOAD BACK THE “CLIPBOARD” OR “STASH”</h4> <code>git stash apply</code> Now you can continue to work where you were previously. <h4>TO DELETE A BRANCH THAT IS NOT USED ANYMORE, but already merged into the current branch. (TO CLEAN UP)</h4> <code>git branch -d [name of branch you want to delete]</code> <h4>TO DELETE AN UNMERGED BRANCH</h4> <code>git branch -D [name of branch you want to delete]</code> <h4>TO DELETE THE STASH. (ERASE THE “CLIPBOARD” FROM MEMORY)</h4> <code>git stash clear</code> <h4>TO SET UP YOUR REPOSITORY FOR SHARING ON A CENTRAL SERVER</h4> Copy up your repository. e.g.: <code>scp -r my_project deploy</code><code>@yourbox.com:my_project</code> Move your files on the remote server to <code>/var/git/my_project</code> For security make the owner of this project git On the repository server: <code>sudo chown -R git:git my_project</code> Then (for security) restrict the “deploy” user to doing git-related things in <code>/etc/passwd</code> with a <code>git-shell</code>. <h4>TO CHECK OUT THE GIT REPOSITORY TO YOUR LOCALHOST. ON YOUR LOCAL HOST DO THIS:</h4> <code>git clone git</code><code>@yourbox.com:/var/git/my_project</code> <h4>TO SEE SOME INFO ABOUT THE REPOSITORY THAT WILL TELL YOU WHICH REPOSITORY IS THE MASTER AND WHICH IS THE SLAVE:</h4> <code>cat .git/config</code> By virtue of having cloned the remote repository, your local repository becomes the slave and will track and synchronize with the remote master branch. <h4>TO UPDATE YOUR LOCAL BRANCH FROM THE REMOTE SERVER:</h4> <code>git pull</code> <h4>TO GET A COPY OF THE ENTIRE REMOTE REPOSITORY (e.g. a repository named “laptop”) WITHOUT MERGING THEM INTO YOUR LOCAL BRANCHES USE FETCH</h4> <code>git fetch laptop</code> <h4>TO MERGE TWO LOCAL BRANCHES (ie. your local xyz branch with your local master branch) USE MERGE</h4> <code>git merge laptop/xyz</code> This merged the (already copied laptop repository’s xyz branch) with the current branch you’re sitting in. <h4>TO MERGE THE REMOTE BRANCH WITH YOUR LOCAL BRANCH THAT YOU ARE SITTING IN USE PULL</h4> <h4>TO ADD LOCAL KNOWLEDGE (TO YOUR LOCAL REPOSITORY) OF A 2ND REMOTE REPOSITORY, LIKE YOUR LAPTOP</h4> <code>git remote add laptop duo2book.local:repos/m_project</code> where ’’’laptop’’" is the name of the remote repository and “‘’duo2book.local’’” is the name of the remote machine. <h4>TO VIEW META INFORMATION ABOUT THAT REMOTE REPOSITORY</h4> <code>git remote show laptop</code> <h4>TO PUSH A COMMITTED LOCAL CHANGE OF THE xyz BRANCH TO THE REMOTE laptop BRANCH</h4> <code>git push laptop xyz</code> <h4>TO CREATE A TRACKING BRANCH (A SLAVE BRANCH). Ie. to link a local branch to a remote branch:</h4> <code>git branch --track local_branch remote_branch</code> <h4>NOW IF YOU’RE SITTING IN THE LOCAL TRACKING BRANCH, TO PULL YOU DON’T NEED TO SPECIFY THE REMOTE TRACKING BRANCH:</h4> <code>git pull</code> Note: You can track(link) different local branches to different remote machines. For example, you can track your friend’s “upgrade” branch with your “bobs_upgrade” branch, and simultaneously you can track the origin’s “master” branch (of your main webserver) with your local “master” branch. By convention, ‘origin’ is the local name given to the remote centralized server which is the way SVN is usually set up on a remote server. <h4>TO SEE WHICH LOCAL BRANCHES ARE TRACKING A REMOTE BRANCH:</h4> <code>git remote show origin</code> <h4>TO WORK WITH AN SVN REPOSITORY BUT WORK WITH GIT LOCALLY:</h4> <code>git-svn clone [http location of an svn repository]</code> Now you can work with the checked out directory as though it was a git repository. (cuz it is) <h4>TO PUSH (COMMIT) CHANGES TO THE REMOTE SERVER</h4> <code>git-svn dcommit</code> <h4>TO UPDATE YOUR LOCAL REPOSITORY FROM THE SVN REPOSITORY</h4> <code>git-svn rebase</code> NOTE: make sure you have your perl bindings to your local svn installation. <h4>I screwed up, how do I reset my checkout?</h4> <code>git checkout -f</code> 2008-04-18T09:17:49-07:00 41 git-cheat-sheet Git Cheat Sheet

2010-02-05T14:46:34-08:00

53574