diff options
Diffstat (limited to '_posts/2008-07-01-git-cheat-sheets.textile')
| -rw-r--r-- | _posts/2008-07-01-git-cheat-sheets.textile | 328 |
1 files changed, 328 insertions, 0 deletions
diff --git a/_posts/2008-07-01-git-cheat-sheets.textile b/_posts/2008-07-01-git-cheat-sheets.textile new file mode 100644 index 0000000..ff97611 --- /dev/null +++ b/_posts/2008-07-01-git-cheat-sheets.textile @@ -0,0 +1,328 @@ +--- +layout: default +title: Git cheat sheets +description: Quick-reference guides to git +categories: git_resources +--- + +h3. Cheat sheets + +* Alexander Zeitler's "Git Cheat Sheet":http://github.com/AlexZeitler/gitcheatsheet +* Zach Rusin's "Git Cheat Sheet":http://zrusin.blogspot.com/2007/09/git-cheat-sheet.html +* "http://cheat.errtheblog.com/s/git/":http://cheat.errtheblog.com/s/git/ +* Nate Murray's "Git Cheat Sheet":http://www.xcombinator.com/2010/09/01/git-cheat-sheet-and-class-notes/ +* "Git - Der Spickzettel":https://github.com/esc/git-cheatsheet-de/ (in German) +* "DZone Git RefCard Cheat Sheet":http://refcardz.dzone.com/refcardz/getting-started-git + +h3. A practical git guide + +_Notes extracted from git screencast at http://www.peepcode.com._ + +h4. Configuration + +identify yourself to git: email and your name + +@git config --global user.name "David Beckwith"@ + +<p><code>git config --global user.email "dbitsolutions@gmail.com"</code></p> + +To view all options: + +@git config --list@ + +OR + +@cat .git/config@ + +h4. Set up aliases + +@git config --global alias.co checkout@ + +h4. View your configuration + +@cat .gitconfig@ + +h4. To ignore whitespace (Ruby is whitespace insensitive) + +@git config --global apply.whitespace nowarn@ + +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 + +@git init@ + +h4. Ignoring files + +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 @log/@ directory, but want to ignore all the files in it, add the following lines to the root @.gitignore@: (lines beginning with '!' are exceptions) + +@log/*@ +@!.gitignore@ + +Then add an empty @.gitignore@ in the empty directory: + +@touch log/.gitignore@ + +h4. Scheduling the addition of all files to the next commit + +@git add .@ + +h4. Checking the status of your repository + +@git status@ + +h4. Committing files + +@git commit -m "First import"@ + +h4. Seeing what files have been committed + +@git ls-files@ + +h4. Scheduling deletion of a file + +@git rm [file name]@ + +h4. Committing all changes in a repository + +@git commit -a@ + +h4. Scheduling the addition of an individual file to the next commit + +@git add [file name]@ + +h4. Viewing the difference as you commit + +@git commit -v@ + +h4. Commit and type the message on the command line + +@git commit -m "This is the message describing the commit"@ + +h4. Commit and automatically get any other changes + +@git commit -a@ + +h4. A "normal" commit command + +@git commit -a -v@ + +h4. Viewing a log of your commits + +@git log@ + +h4. Viewing a log of your commits with a graph to show the changes + +@git log --stat@ + +h4. Viewing a log with pagination + +@git log -v@ + +h4. Visualizing git changes + +@gitk --all@ + +h4. Creating a new tag and pushing it to the remote branch + +@git tag "v1.3"@ +@git push --tags@ + +h4. Creating a new branch + +@git branch [name of your new branch]@ + +h4. Pushing the branch to a remote repository + +@git push origin [new-remote]@ + +h4. Pulling a new branch from a remote repository + +@git fetch origin [remote-branch]:[new-local-branch]@ + +h4. Viewing branches + +@git branch@ + +h4. Viewing a list of all existing branches + +@git branch -a@ + +h4. Switching to another branch + +The state of your file system will change after executing this command. + +@git checkout [name of the branch you want to switch to]@ + +OR + +@git co [name of the branch you want to switch to]@ + +h4. Making sure changes on master appear in your branch + +@git rebase master@ + +h4. Merging a branch back into the master branch + +First, switch back to the master branch: + +@git co master@ + +Check to see what changes you're about to merge together, compare the two branches: + +@git diff master xyz@ + +If you're in a branch that's not the @xyz@ branch and want to merge the @xyz@ branch into it: + +@git merge xyz@ + +h4. Reverting changes to before said merge + +@git reset --hard ORIG_HEAD@ + +h4. Resolving conflicts + +Remove the markings, add the file, then commit. + +h4. Creating a branch (and switching to the new branch) in one line + +@git checkout -b [name of new branch]@ + +h4. Creating a stash (like a clipboard) of changes to allow you to switch branches without committing + +@git stash save "Put a message here to remind you of what you're saving to the clipboard"@ + +h4. Switching from the current branch to another + +@git co [branch you want to switch to]@ + +Do whatever +Then switch back to the stashed branch + +@git co [the stashed branch]@ + +h4. Viewing a list of stashes + +@git stash list@ + +h4. Loading back the stash + +@git stash apply@ + +Now you can continue to work where you were previously. + +h4. Deleting a branch (that has been merged back at some point) + +@git branch -d [name of branch you want to delete]@ + +h4. Deleting an unmerged branch + +@git branch -D [name of branch you want to delete]@ + +h4. Deleting a stash + +@git stash clear@ + +h4. Setting up a repository for use on a remote server + +Copy up your repository. e.g.: + +<p><code>scp -r my_project deploy@yourbox.com:my_project</code></p> + +Move your files on the remote server to @/var/git/my_project@ +For security make the owner of this project git +On the repository server: + +@sudo chown -R git:git my_project@ + +Then (for security) restrict the "deploy" user to doing git-related things in @/etc/passwd@ with a @git-shell@. + +h4. Checking out a git repository from a remote to your local storage + + <p><code>git clone git@yourbox.com:/var/git/my_project</code></p> + +h4. Viewing extra info about a remote repository + +@cat .git/config@ + +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. Updating a local branch from the remote server + +@git pull@ + +h4. Downloading a copy of an entire repository (e.g. @laptop@) without merging into your local branch + +@git fetch laptop@ + +h4. Merging two local branches (ie. your local xyz branch with your local master branch) USE MERGE + +@git merge laptop/xyz@ + +This merged the (already copied laptop repository's xyz branch) with the current branch you're sitting in. + +h4. Viewing metadata about a remote repository + +@git remote show laptop@ + +h4. Pushing a committed local change from one local branch to another remote branch + +@git push laptop xyz@ + +h4. Creating a tracking branch (i.e. to link a local branch to a remote branch) + +@git branch --track local_branch remote_branch@ + +You do not need to specify the local branch if you are already sitting in it. + +@git pull@ + +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. Seeing which local branches are tracking a remote branch + +@git remote show origin@ + +h4. Working with a remote Subversion repository (but with git locally) + +@git-svn clone [http location of an svn repository]@ + +Now you can work with the checked out directory as though it was a git repository. (cuz it is) + + +h4. Pushing (committing) changes to a remote Subversion repository + +@git-svn dcommit@ + +h4. Updating a local git repository from a remote Subversion repository + +@git-svn rebase@ + +NOTE: make sure you have your perl bindings to your local svn installation. + +h4. I screwed up, how do I reset my checkout? + +@git checkout -f@ + +h3. See also + +* "Git for computer scientists. (lots of pictures)":http://eagain.net/articles/git-for-computer-scientists/ +* "Git user's manual":http://www.kernel.org/pub/software/scm/git/docs/user-manual.html +* "Git Magic":http://www-cs-students.stanford.edu/~blynn/gitmagic/ +* "Git Cheat Sheets Collection":http://devcheatsheet.com/tag/git/ on DevCheatSheet.com
\ No newline at end of file |