Setup
-----
git clone <repo>
clone the repository specified by <repo>; this is similar to "checkout" in
some other version control systems such as Subversion and CVS
Who doesn't like colors? Optionally add the following to your .git/config file:
[color]
branch = auto
diff = auto
status = auto
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[color "diff"]
meta = yellow bold
frag = magenta bold
old = red bold
new = green bold
[color "status"]
added = yellow
changed = green
untracked = cyan
Info
----
git diff
show a diff of the changes made since your last commit
git log
show recent commits, most recent on top
git show <rev>
show the changeset (diff) of a commit specified by <rev>, which can be any
SHA1 commit ID, branch name, or tag
git blame <file>
show who authored each line in <file>
git blame <file> <rev>
show who authored each line in <file> as of <rev> (allows blame to go back in
time)
Adding / Deleting
-----------------
git add <file1> <file2> ...
add <file1>, <file2>, etc... to the project
git add <dir>
add all files under directory <dir> to the project, including subdirectories
git add .
add all files under the current directory to the project
git rm <file1> <file2> ...
remove <file1>, <file2>, etc... from the project
Committing
----------
git commit <file1> <file2> ... [-m <msg>]
commit <file1>, <file2>, etc..., optionally using commit message <msg>,
otherwise opening your editor to let you type a commit message
git commit -a [-m <msg>]
commit all files changed since your last commit, optionally using commit
message <msg>
Sharing
-------
git pull
update the current branch with changes from the server. Note: .git/config
must have a [branch "some_name"] section for the current branch. Git 1.5.3
and above adds this automatically.
git push
update the server with your commits made to all branches that are *COMMON*
between your local copy and the server. Local branches that were never pushed
to the server in the first place are not shared.
git push <branch>
update the server with your commits made to <branch> since your last push.
This is always *required* for new branches that you wish to share. After the
first explicity push, "git push" by itself is sufficient.
Branching
---------
git branch
list all branches
git branch <branch>
create a new branch named <branch>, referencing the same point in history as
the current branch
git branch <branch> <start-point>
create a new branch named <branch>, referencing <start-point>, which may be
specified any way you like, including using a branch name or a tag name
git branch -d <branch>
delete the branch <branch>; if the branch you are deleting points to a commit
which is not reachable from the current branch, this command will fail with a
warning.
git branch -D <branch>
even if the branch points to a commit not reachable from the current branch,
you may know that that commit is still reachable from some other branch or
tag. In that case it is safe to use this command to force git to delete the
branch.
git checkout <branch>
make the current branch <branch>, updating the working directory to reflect
the version referenced by <branch>
git checkout -b <new> <start-point>
create a new branch <new> referencing <start-point>, and check it out.
Merging
-------
git merge <branch>
merge branch <branch> into the current branch; this command is idempotent and
can be run as many times as needed to keep the current branch up-to-date with
changes in <branch>
git merge <branch> --no-commit
merge branch <branch> into the current branch, but do not autocommit the
result; allows you to make further tweaks
git merge <branch> -s ours
merge branch <branch> into the current branch, but in the case of any
conflicts, the files in the current branch win.
Conflicts
---------
If merging resulted in conflicts in file(s) <file1>, <file2>, etc..., resolve
the conflict(s) manually and then do:
git add <file1> <file2> ...
git commit -a
Reverting
---------
git revert <rev>
reverse commit specified by <rev> and commit the result. This does *not* do
the same thing as similarly named commands in other VCS's such as "svn revert"
or "bzr revert", see below
git checkout <file>
re-checkout <file>, overwriting any local changes
git checkout .
re-checkout all files, overwriting any local changes. This is most similar to
"svn revert" if you're used to Subversion commands
Undo
----
git reset --hard
abandon everything since your last commit; this command can be DANGEROUS. If
merging has resulted in conflicts and you'd like to just forget about the
merge, this command will do that
git reset --hard ORIG_HEAD
undo your most recent *successful* merge *and* any changes that occurred
after. Useful for forgetting about the merge you just did. If there are
conflicts (the merge was not successful), use "git reset --hard" (above)
instead.
