Git quick reference

From FedoraProject

(Difference between revisions)
Jump to: navigation, search
m (Fix wiki formatting)
m (Add the --track option to git checkout)
Line 60: Line 60:
 
to determine the name of the remote branch you want to work on.  Remote branches will be preceded by <code>origin/</code>.  Then use this to switch to it:
 
to determine the name of the remote branch you want to work on.  Remote branches will be preceded by <code>origin/</code>.  Then use this to switch to it:
  
<code>git checkout -b <branch> origin/<branch></code>
+
<code>git checkout --track -b <branch> origin/<branch></code>
  
 
== Maintainer Operations ==
 
== Maintainer Operations ==

Revision as of 18:31, 20 October 2008


Warning (medium size).png
Quick Reference Only
This is not intended to be an exhaustive list of git operations. See the documentation for that.

Contents

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 user.name "John Q. Public"

git-config --global user.email "john.public@example.com"

git-config --global color.diff auto

git-config --global color.status auto

git-config --global color.branch auto

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

Use:

git branch -a

to determine the name of the remote branch you want to work on. Remote branches will be preceded by origin/. Then use this to switch to it:

git checkout --track -b <branch> origin/<branch>

Maintainer Operations

Apply mailed git patch

git am <file>