Git - The Social Coding System

Ad

Ad

Ad

Ad

Ad

Ad

Ad

Ad

Ad

Ad

Ad

Ad

Git
Social Coding System
Social

/ josephj
joseph_chiang@miiicasa.com

Git

1. CVS
2. Perforce

Git

1. CVS
2. Perforce
3. SVN

Client-Server

miiiCasa
Repo.

Client-Server

miiiCasa
Repo.
Joseph t
checkou

Client-Server

miiiCasa
Repo.
Joseph t
...

Client-Server

miiiCasa
Repo.
Joseph t
...

Client-Server

miiiCasa
Repo.
Joseph t ...

Client-Server

miiiCasa
commit Repo.
Joseph t ...

Client-Server

miiiCasa
commit Repo.
Joseph t ...

Client-Server

miiiCasa
commit Repo.
Joseph t ...

Client-Server

miiiCasa
commit Repo.
...

Client-Server

miiiCasa
commit Repo.
...

Client-Server

FTP
miiiCasa
commit
...

Client-Server

miiiCasa
commit Repo.
...

Client-Server

Client-Server
miiiCasa
commit Server...

P2P
Server Client

http://www.flickr.com/photos/rocketraccoon/227241974/

Linus Torvalds Linux
Linux ...

CVS SVN
Linus Torvalds
Linux Subversion has been the
...

CVS SVN
Linus Torvalds
Linux Subversion has been the
...

Git P2P
Peer-To-Peer

git clone Repo
Repo clone

Git P2P
Peer-To-Peer

miiiCasa

...

Git P2P
Peer-To-Peer

miiiCasa
...

git commit
miiiCasa

Repository

Joseph

Hunter

...

git commit
miiiCasa

Repository

Joseph

vim foo.txt
...

git commit
miiiCasa

Repository

Joseph

vim foo.txt
...

git commit
miiiCasa

Repository

Joseph

vim foo.txt
...

git commit
miiiCasa

Repository

Commit

Jose...

git commit
miiiCasa

Repository

Commit

...

git commit
miiiCasa

Repository

Commit

...

git pull
miiiCasa
Origin Repo

Joseph
Hunter

Kevin

git pull
miiiCasa
Origin Repo

Joseph
Hunter
...

git pull
miiiCasa
Origin Repo

git pull

Joseph
...

git pull
miiiCasa
Origin Repo

+
...

git pull
miiiCasa
Origin Repo

+
...

git pull
miiiCasa
Origin Repo

+
...

git pull <remote> <branch>
miiiCasa
Repo

...

git pull <remote> <branch>
miiiCasa
Repo

...

git pull <remote> <branch>
miiiCasa
Repo

...

git pull <remote> <branch>
miiiCasa
Repo

...

git pull <remote> <branch>
miiiCasa
Repo

...

git pull <remote> <branch>
miiiCasa
Repo

...

git push
miiiCasa
Origin

git clone
Joseph
...

git push
miiiCasa
Origin

git clone
Joseph
...

git push
miiiCasa
Origin

git push

git...

miiiCasa
+
Kevin
git push
...

miiiCasa
+
Kevin
git pus...

miiiCasa
+
Kevin
git pus...

Facebook

Web 2.0 ?

• git clone
Repo

• git clone
Repo

• git add + commit
Repo

• git clone
Repo

• git add + commit
Repo

• git pull / push
Repo merge

• Commit
( SVN )

• Commit
( SVN )

• git pull / push

( Centra...

• Commit
( SVN )

• git pull ...

Git Central Repo
Centralization?

Git
2 pull/push
Read/Write

SCM
Centralized Peer-To-Peer

push miiiCasa push

Joseph pull ...

miiiCasa gitosis
https://github.com/res0nat0r/gitosis

Git Branch

Branch

Branch Task
diff

Branch

Joseph’s Repo

master

Task

Branch

Joseph’s Repo

bug doc

master

enhance crazy

...

git branch
Branch

git branch
Branch

Joseph’s Repo
Commit 0

master

git branch
Branch

Joseph’s Repo
Commit 0

mas...

git branch
Branch

Joseph’s Repo
Commit 0

mas...

git branch
Branch

Joseph’s Repo
Commit 0

...

git branch
Branch

Joseph’s Repo
Commit 0

...

git branch
Branch

Joseph’s Repo
Commit 0 ...

git branch
Branch

Joseph’s Repo
Commit 0 ...

git branch
Branch

Joseph’s Repo
Commit 0 ...

git rebase
branch master

git rebase
branch master

Joseph’s Repo
Commit 0 ...

git rebase
branch master

Joseph’s Re...

git rebase
branch master

Jos...

git merge
master

git merge
master

Joseph’s Repo
Commit 0 Commit 1 ...

git merge
master

J...

git merge
master

...

git merge
master

...

git merge
master

...

• git branch crazy
branch crazy

• git branch crazy
branch crazy

• git checkout crazy
crazy branch

• git branch crazy
branch crazy

• git checkout crazy
crazy branch

• git rebase master
master ...

• git branch crazy
branch crazy

• git checkout crazy
crazy branch

• git rebase master
mas...

Git Branch
Branch

Git Remote Branch
Branch

SVN Branch

Git

Git Branch
Origin

master

Joseph ...

Git Branch
Origin

master

Joseph ...

Git Branch
Origin

master

Joseph ...

Git Branch
Origin

master f2e-enhance

...

Git Branch
Origin

master f2e-enhance

...

Git Branch
Origin

master f2e-enhance

...

Git Branch
Origin

master f2e-enhance

...

Git Branch
Origin

hotfix

...

Git Branch
Origin

hotfix

...

Git Branch
Origin

hotfix

...

Git Remote Branch
Branch
Code Review

miiiCasa grb branch
https://github.com/blog/98-git-remote-branch

- Git Submodule

Repo

Open Source Library

Code
Commit Repo.

Submodule
jquery ~

jquery

github
git://github.com/jquery/jquery.git

j...

jquery

github
git://github.com/jquery/jquery....

jquery

github
git://github.com/jquery/jquery....

jquery

github
git://github.com/jquery/jquery.git

jque...

jquery

github
git://github.com/jquery/jquery.git

...

jquery

github
git://github.com/jquery/jquery.git
...

jquery

github
git://github.com/jquery/jquery.git
...

jquery

github
git://github.com/jquery/jquery.git

...

jquery

github
git://github.com/jquery/jquery.git

...

jquery

github
git://github.com/jquery/jquery.git

...

miiiCasa submodule

submodule

http://josephj.com/entry.php?id=342
http://josephj.com/entry.php?id=357

vimdiff Git diff
http://blog.longwin.com.tw/2009/11/vimdiff-vs-git-diff-2009/

post-receive
git push
http://josephj.com/entry.php?id=346

post-receive Ticket

post-receive Ticket
> git commit -m “Commit just for testing trac-post-receive #1831”
> gi...

post-receive Ticket
> git commit -m “Commit just for testing trac-post-receive #1831”
> gi...

post-receive Ticket
> git commit -m “Commit just for testing trac-post-receive #1831”
> gi...

post-receive Ticket
> git commit -m “Commit just for testing trac-post-receive #1831”
> gi...

pre-commit
PHPCS, JSLint, CSSLint Commit

GitHub
Social Coding

Open Source Project github

Social Coding
Open Source

Social Coding
Open Source

Social Coding
Open Source

git clone ( )

Social Coding
Open Source

fork

git clone ( )

Social Coding
Open Source

merge

fork

git clone ( )

Social Coding
Open Source

merge

fork
Bug

...

Social Coding
Open Source

merge

Bug
...

github Open

miiiCasa
private central
...

github Open

github.com

...

github Open

github.com

...

github Open

github.com

...

Google Code 2011/8/1 Git
http://googlecode.blogspot.com/2011/08/anno...

Git
GitHub
Open

Git
GitHub
Open

Git
GitHub
Open

...

Git
GitHub
Open

...
Github

Git
GitHub
Open

...
Github
Social Cod...

Questions

• Git SVN, CVS

Questions

• Git SVN, CVS
• Git Issue System

Questions

• Git SVN, CVS
• Git Issue System
• SVN Git

Questions

• Git SVN, CVS
• Git Issue System
• SVN Git
• Git

Questions

• Git SVN, CVS
• Git Issue System
• SVN Git
• Git

Any more questios?

Share Slideshare

LinkedIn
Facebook
Twitter

Embed

Size (px)

Show related Slideshows at end

WordPress Shortcode

Link

Share
Email

寫給大家的 Git 教學 by littlebtc 213668 views

View on Slideshare

1 of 169 Ad

View on Slideshare

1 of 169 Ad