From Fedora Project Wiki

Revision as of 16:02, 18 March 2011 by Tmz (talk | contribs) (→‎Switch to a branch that was pushed remotely: Modern git does the right thing with just git checkout -t origin/<branch>)

Quick Reference Only
This is not intended to be an exhaustive list of git operations. See the documentation for that.

Basic Operations

Configure your global git settings

Running these commands will setup your global git settings. You should obviously use your own contact details. Should you wish to change your details, you can edit the '~/.gitconfig' file for global settings, or edit '.git/config' to change settings on a particular repo.

git config --global "John Q. Public"

git config --global ""

git config --global color.ui auto

See the git config documentation for many more configuration options.

Display current branch in bash

If you work with branches, and you should, this setting helps you keep track of which branch you are in at a given time. If you are in a git working directory, it shows the current branch as part of the prompt:

[user@host directory-name (master)]$ 

To enable this, you can take advantage of the __git_ps1 function, provided by /etc/bash_completion.d/git in the git package. Add this line to ~/.bashrc:

export PS1='[\u@\h \W$(type __git_ps1 &>/dev/null && __git_ps1 " (%s)")]\$ '

If you do not have the bash-completion package installed, you must manually source the git completion script prior to using __git_ps1(). To do this, add "source /etc/bash_completion.d/git" to ~/.bashrc.

To activate bash configuration changes, run source ~/.bashrc.

In addition to displaying the current branch, this will show when you are in the middle of a merge or rebase.

You might also want to display when there are changes in your work tree or the git index:

[user@host directory-name (master*)]$ 
[user@host directory-name (master+)]$ 
[user@host directory-name (master%)]$ 
  • On the first line, a tracked file was modified
  • On the second line, a tracked file was modified and staged (with git add)
  • On the third line, you have untracked files in your tree

Of course, those can combine themselves...

To do so, simply add these lines in your ~/.bashrc, right before the line modifying your prompt:


See the comments at the beginning of /etc/bash_completion.d/git for more details.

Initialize a new repo

mkdir repo && cd repo && git init

Once you've created a repo, you'll find a '.git' folder inside it. What you essentially have at this point is a bare repo -- a repository with the git configs, but no actual files contained in the repository. Now let's create a file and tell git that we want it to be part of our repo. From the repo directory (not the .git directory), type:

echo "Blah" > test.txt

git add test.txt

We can then commit the changes by typing:

git commit test.txt

Another way of committing all the changes (without having to specify all the files that have changed) is to type:

git commit -a

Either way, it will bring up whichever editor you have defined in $EDITOR and allow you to write a commit log message explaining the changes you've made. A commit log message usually consists of:

  • a one-line summary of your changes
  • a blank line
  • one or more additional lines with more detail. These lines are optional.

You can always check the status of your current repo by typing

git status

Developer Operations

Create a new local branch

git checkout -b <branch>

Push and create a new remote branch from an existing local branch of the same name

git push origin <branch>

Switch to a branch that was pushed remotely


git branch -r

to determine the name of the upstream branch you want to work on. Then use this to switch to it:

git checkout --track origin/<branch>

This creates a local branch named <branch> and tells git that it came from origin/<branch>. Using git status will show you whether your local branch is ahead, behind, or otherwise different than the upstream branch.

If you want to use a different name for your local branch, you can use:

git checkout --track --branch <some-other-name> origin/<branch>

Maintainer Operations

Remove a remote branch

This is a dangerous operation.
If there's any chance that other people are using the remote branch, you should at least warn them before doing this.

Assuming you had a branch named blah on the remote server, you could remove it by typing:

git push origin :blah

Apply mailed git patch

git am <file>