Version 4 (modified by dukeleto, 5 years ago)

--

checkout

To check out a repo:

git checkout git://github.com/leto/parrot.git

There should now be a directory called "parrot" in your current directory.

commit

Next we modify a file so we can commit a change:

echo "Some junk" >> README

To see a list of modifies files:

git status

should produce something like

# On branch master
# Changed but not updated:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#	modified:   README
#

To commit all local changes:

git commit -a -m "I did some stuff"

If you had multiple changed files that you wanted to commit seperately, you would do

git add README
git commit -m "I commit stuff"

LESSON: Git only commits files you have added already. The -a flag lets you be lazy and say "go ahead and add all modified files" when you are commiting.

update

The equivalent of "svn up" is

git pull

list branches

To see a list of current local branches:

git branch

To see all local and remote branches:

git branch -a

merge

To merge the foobar branch into the current branch:

git merge foobar