Git Quick Guide Learn Git A Fast and Flexible Version Control Tool in simple and easy steps starting from its installation, project creation, file addition. Say Im in a Git repository. I delete a file and commit that change. I continue working and make some more commits. Then, I find I need to restore that file. I know I. Remote repositories. Right now our commit is local it exist only in the. Although a local repository is useful by itself, in most cases we will want to. A few of my Git tricks, tips and workflows. Note A german translation is available here. This post is based on a talk I gave at the 1. Cocoaheads Meetup Vienna CHW0. Feb 1. 7th, 2. 01. Git Restore Deleted File Before Commit' title='Git Restore Deleted File Before Commit' />It is an annotated tour of my Git config, Git related scripts and commands, and various other tips and tricks I picked up over the years. You can find most of these things in my dotfiles repo, as well with a lot of other stuff, like parts of my Zsh config. Patches welcome. Warning Some of these tricks and tips are specific to my setup Mac OS X Snow Leopard, Git 1. This tutorial explains the usage of the distributed version control system Git via the command line. The examples were done on Linux Ubuntu, but should also work on. I have added a file named file1. After that I committed it, added a couple directories called dir1 and dir2, and committed them to git repo. Now the. I also assume you have basic knowledge of the command line. The Basics. Getting Help. No matter what youre doing with Git, theres always some kind of documentation that can help you out. But you should know where to get what. There are basically two ways on the command line. The first one is typing git lt command h replacing lt command with the command in question of course, and Git will print a short overview of the call syntax as well as the most important options for you. The second one is having a look at the manpages themselves. The fastest way to get to them is by typing git help lt command, and git will open them for you. They are more thorough, but arent for the faint of heart either. On the web, there are a few more options. The Git Homepage lists quite a few introductions, tutorials, guides as well as online books that can help you out. Git Autocompletion for your shell. I use Git primarily from the command line. Luckily, enabling the Git completion for both Bash and Zsh is quite easy if you used Homebrew to install Git. Simply add the following to your. If you got Git some other way, check if that includes the completion file. If not, you can always clone the git repo, and copylink it from there. If you use Zsh, like me, theres a bit more involved. Add the following to your. Enable bash completion for git. This allows git completion to work properly. Update 2. 01. 1 0. If youre using a newer ZSH Ive tested this with 4. Git completion will automagically work for you if you already have autoload U compinit compinit in your. If your version of ZSH is older, you can download the git completion from the ZSH repository ht graywh on Hacker NewsAlias git to gI also alias git to g, saving me 6. Also, Im lazy. Add the following to your. Now, youll probably also want to have the Git Autocompletion when youre using g as well. Add this to your. Autocomplete for g as well. F git g. git config1In here, you can store all the global Git configuration settings. The. gitconfig file uses the INI file format to store settings, but you can also set and get all values by using git config. The most basic settings you should do are your name and e. Mail, both of which are included in every commit you make git config global user. Markus Prinz. git config global user. Not that Im telling you how to run your life or anything, but you probably want use your own name and e. Mail address instead of mine. Over time, you will accumulate your own set of configs that tweak Git to your liking. Here are a few of my settings that I find very useful Allow all Git commands to use colored output, if possiblegit config global color. Disable the advice shown by Git when you attempt to push something thats not fast forward ablegit config global advice. Non. Fast. Forward false. Disable how to stageunstageadd hints given by git status git config global advice. Hints false. Tell Git which whitespace problems it should recognize, namely any whitespace at the end of a line, as well as mixed spaces and tabs git config global core. See the man page for more possible options on this. Allow git diff to do basic rename and copy detection git config global diff. Tell git diff to use mnemonic prefixes index, work tree, commit, object instead of the standard a and b notation git config global diff. When branching off a remote branch, automatically let the local branch track the remote branch git config global branch. When pushing without giving a refspec, push the current branch to its upstream branch. See the git config man page for more possible options. Enable the recording of resolved conflicts, so that identical hunks can be resolved automatically later on. You may also want to investigate the rerere. Always show a diffstat at the end of a merge git config global merge. Now, youll notice that for each and every git config I used the global option. The reason for that is that Git not only looks at your global gitconfig located at. So you can customize all these settings for each of your repository to your liking, just run the git config command in your repository without the global flag. You dont want to commit all your files into your repository. Things like temporary files, logs, configurations that are specific to a computer, files that are for testing only, private keys for code signing or files that can be easily regenerated all dont belong in your repository. However, they will still show up whenever you type git status, even though they are purely noise at that point. For this reason you can specify what files you want Git to ignore in a special file called. Placed at the root of the repository, it contains glob patterns specifying all the files you want Git to ignore. Any file and directory matched by these globs wont show up in git status, and if you try to add them via git add, Git will refuse to do so you can still add them by specifying the f flag when adding. For example, Rails 3 projects use the following. This tells Git to ignore the. Depending on what kind of project youre working on, youll want to specify your own patterns. To save the work, Git. Hub has a gitignore repository with glob patterns for many programming languages, frameworks and platforms. There are also Xcode 3 4 specific. However, you can also tell Git to use a global. I keep mine at. DSStore and Icon Now all you need to do is tell git where it can find that file git config global core. Now youll never have to worry about any of these files showing up in your git status output any more. This file allows you to specify attributes for given paths. Its not a feature youll need often, but it can be incredibly handy. For example, in Rails projects, the dbschema. But instead of having to do that by hand every time, we can tell Git to do it for us. First, youll need to add this to your. Rails schema version. L, A, O, Bn. File. An. Active. Record Schema. Active. Record Schema. Active. Record Schema. File. openA, w f f. L. This specifies a new merge strategy called railsschema, along with the necessary command that Git needs to execute to resolve conflicts. Roll Bond Evaporator Design Pdf. The command itself is just a piece of Ruby code that figures out which schema. Then, in your. This tells Git than whenever it is merging dbschema. And we wont ever have to manually merge schema. You can also use this file to specify which end of line conversions Git should perform for certain file types, or files that it should treat as binary files. See the man page for more details. Every time Git does something, you usually have the option of taking an action before or after Git has done its bit. An example of this would be a pre commit hook, that you could use to prevent a commit from happening according to some custom criteria.