�ݺ�ߣ

Outline
Install and Con?gure Git (x)

Git Concepts

Git Commands

Git Work?ow

Git Hosting (GitHub, Bitbucket)

Case Studies

Installation

Git for OS X

http://code.google.com/p/git-osx-installer/

Git for Windows

http://code.google.com/p/msysgit/

Setting user's name and
email globally in git

$ git con?g --global user.name "Victor Wong"

$ git con?g --global user.email
"victorwkm@gmail.com"

$ git con?g user.name

bonus: $ cat ~/.gitcon?g

Add color to status and
branch

$ git con?g --global color.status auto

$ git con?g --global color.branch auto

Git Concepts
remote repo <-> local repo <-> staging area <-> working directory

# On branch master

# Changes to be committed:

# (use "git reset HEAD <?le>..." to unstage)

# Changed but not updated:

# (use "git add <?le>..." to update what will be committed)

# (use "git checkout -- <?le>..." to discard changes in working directory)

# Untracked ?les:

# (use "git add <?le>..." to include in what will be committed)

Git Distributed Version Control System

Basic Git Commands
Creating & Getting Branching Inspection
init branch log
clone checkout show
merge

Basic Remote Sharing
status remote
add push
commit pull
mv, rm fetch
tag

Advanced Git Commands
git-stash git-pop git-apply

git-blame git-diff git-re?og

git-reset git-revert

git-clean

git-rebase

git-fetch

$ git commit -m 'Change the master!'

$ git checkout master
$ git merge iss53
Merge made by recursive.
README | 1 +
1 ?les changed, 1 insertions(+), 0 deletions(-)

$ git status
$ vim index.html
$ git add index.html
$ git commit

.git/

con?g

hooks (pre-commit, post-commit, ...)

Centralized Work?ow
(us)

Integration-Manager
Work?ow (GitHub)

Dictator and Lieutenants
Work?ow (Linux)

GitHub

Code Review

Commit Comments

Analyze Branches

Compare View

Pull request

Can I change the commit
message before or after push?

Can I change the commit
message before or after push?

$ git commit --amend

bonus: $ git rebase -i

Note: Never change your commit history
after push to a public repository!

How do I ignore ?les in a project? Some ?les
such as .log which shouldn't be include in every
project, can I ignore it in every projects?

How do I ignore ?les in a project? Some ?les
such as .log which shouldn't be include in every
project, can I ignore it in every projects?

$ vim .gitignore

... add the ?le and folder path that you don't want git to
track ...

$ vim ~/.gitignore_global

$ git con?g --global core.excludes?le ~/.gitignore_global

Bonus: git con?g --global --list

Remind: Don't add too much ?les in the globa excludes?le

Search commit message
git log -g --grep=<pattern>

-g, --walk-re?ogs

Instead of walking the commit ancestry chain, walk
re?og entries from the most recent one to older ones.

--grep=<pattern>

Limit the commits output to ones with log message that
matches the speci?ed pattern (regular expression).

Can I change the ?lename case in Git?
fatal: destination exists,
source=font.ttf, destination=Font.ttf

Can I change the ?lename case in Git?
fatal: destination exists,
source=font.ttf, destination=Font.ttf

git mv -f font.ttf Font.ttf

You have pushed a WordPress folder in the Github and pull it from
the server.
But you make a mistake, you want to
- keep the wp-con?g.php in the server
- remove it on the GitHub, so your colleagues won't get a copy of
the wp-con?g.php

You have pushed a WordPress folder in the Github and pull it from
the server.
But you make a mistake, you want to
- keep the wp-con?g.php in the server
- remove it on the GitHub, so your colleagues won't get a copy of
the wp-con?g.php

[On the server]

$ vim .gitignore

$ git commit -am 'ignore wp-con?g.php ?le'

$ git rm --cached wp-con?g.php

$ git commit -m 'remove wp-con?g.php'

$ git push

Clients: This feature worked well in the past.
Why does it not work properly today?
We: How do we use Git to quickly identify the
issue?

Clients: This feature worked well in the past.
Why does it not work properly today?
We: How do we use Git to quickly identify the
issue?

Use GitHub to:

search

history

blame

$ git checkout <commit-sha>

Can I undo a git
commit?
Preserve all changes as unstaged changes

$ git reset HEAD^

Preserve all changes

$ git reset --soft HEAD^

Discard all changes

$ git reset --hard HEAD^

You are on a branch called "development", and you received
an email from the client said this bug needs to be ?xed
now! Hence, you tried to switch your branch to "hot?x" or
"master" to do a quick ?x, but your working dirctory is
"dirty", what should you do?

You are on a branch called "development", and you received
an email from the client said this bug needs to be ?xed
now! Hence, you tried to switch your branch to "hot?x" or
"master" to do a quick ?x, but your working dirctory is
"dirty", what should you do?

$ git stash

$ git checkout master

... ?x issue ...

$ git commit -am "?x issue #100"

$ git checkout development

$ git stash list

$ git stash pop

bonus: $ git stash apply stash@{0} $ git stash drop stash@{0}

The same code can also applied to the
following scenario.

After ?nishing the development, you suddenly
realized the you are developing a feature on
the WRONG branch. Can I save those
changes and apply those changes in the
correct branch?

Recommendations

Read the git ERROR message

Commit or lose it

Do one thing at a time (the smaller the
better)

Don��t modify any history after pushing to live

Practice together

References

Git Reference http://gitref.org/

Pro Git http://git-scm.com/book

�ݺ�ߣ

Git Distributed Version Control System

Recommended

More Related Content

What's hot (20)

Similar to Git Distributed Version Control System (20)

Git Distributed Version Control System

Editor's Notes