際際滷

際際滷Share a Scribd company logo
GIT
DISTRIBUTED VERSION CONTROL SYSTEM
WHO?
Dimigo 10th WP
SSU - Electronic
SWMaestro 6th
???(Luavis)
WHAT?
Git
[?/?/??]
SIMPLIFY
Google Docs for developer
WHAT?
???? ??? ?? ??? ?? ?? ?
1. ??
2. ???? ??? ??
3. ??? ???
4. ??? ????
COMMIT
WORKING DIRECTORY
STAGING AREA
REPOSITORY
?? ???? ??
commit? ?? ????
commit? ???? ??
add/rm
commit
COMMIT
COMMIT
REPOSITORY
COMMIT
COMMIT
COMMIT
COMMIT
DISTRIBUTED
COMMIT
My Local
COMMIT
COMMIT
COMMIT
COMMIT
COMMIT
Origin
COMMIT
COMMIT
COMMIT
Other Local
COMMIT
COMMIT
COMMIT
COMMIT
PUSH PULL
DISTRIBUTED
COMMIT
My Local
COMMIT
COMMIT
COMMIT
COMMIT
COMMIT
Origin
COMMIT
COMMIT
COMMIT
Other Local
COMMIT
COMMIT
COMMIT
COMMIT
COMMIT
COMMIT
COMMIT
COMMIT
DISTRIBUTED
COMMIT
My Local
COMMIT
COMMIT
COMMIT
COMMIT
COMMIT
Origin
COMMIT
COMMIT
COMMIT
Other Local
COMMIT
COMMIT
COMMIT
COMMIT
COMMIT
COMMIT
COMMIT
COMMIT
COMMIT
COMMIT
COMMIT
COMMIT
BASIC
1. log / diff / status
2. add
3. commit
4. rebase
5. push
6. pull
7. reset
CONFLICT
How to solve conflict
BRANCH
1. branch
2. checkout
3. merge
.GITIGNORE / .GITATTRIBUTE
1. .gitignore
2. .gitattributes
OTHERS
1. Stash
2. Cherry-pick
OTHERS
1. trailing whitespace
2. git-flow
3. hooks
GIT-FLOW
OTHERS

More Related Content