�ݺ�ߣ

git

Handlino http://handlino.com/

basics


git ...
?
?
? Everything is local
? : commit / tag / tree / blob
?

git clone git://host/project.git
git clone ssh://host/project
git clone /path/to/project

# project/

# project/.git/


cd project

git log
git log --graph
git branch -a
git blame src.rb

gitx # http://gitx.frim.nl
gitk # built-in


��ǳ��١�
sha1 digest

commit 9d38288f99caa27b7368d8a2b26c3b545f0eb37b
Author: tka lu <tka@mail2000.com.tw>
Date: Wed Dec 23 08:51:59 2009 +0800

fix label_render in form_interface_helper


more ��git log��
git log <from>...<to> # <to> is default to HEAD

git log 22f9d..5d113
git log 22f9d..5d113 --name-only
git log 22f9d..5d113 -u
git log HEAD~10..

git log --pretty=oneline
--abbrev-commit
--decorate
HEAD~10..


more ��git log��
git config alias.lol

'log --pretty=oneline --abbrev-commit --graph --decorate'

git lol '@{10 days ago}..'

git lol '@{1 week ago}..'
git lol '@{1 week ago}..'

git lol '@{2009-12-20 01:01:01}..'


vim src1.pl src2.pl

git status #

git diff #

git add src1.pl src2.pl # staging area

git diff --cached # staging area

git commit -m "An *awesome* work" # staging area


Staging area

git add git commit


git pull # ��

git push # !

git pull github master
git push github bug-31337


mkdir NewProject
cd NewProject
git init
echo "New Project" > README
git add README
git ci -m "first commit!"


git reset HEAD^ #

git reset <sha1> #

vim src1.pl

git add src1.pl src2.pl
git commit -m "An *awesome* work"


git log
git status
git branch
git commit
git checkout
git merge
git add
git tag
git diff


branch / merge


branch
git branch
git branch -a

git branch <new branch name>
git checkout <branch name>
git checkout -b <new branch name>


merge
git checkout <branch name>
git merge <other branch name>

git checkout job-a
git merge job-b
# job-a <-job-b


What is a ��branch�� ?

c866

master



git commit

c866 a957

master



git commit

c866 a957 8ecd

master



git commit

c866 a957 8ecd 316f

master


git commit

c866 a957 8ecd 316f 1aee

master



git commit

c866 a957 8ecd 316f 1aee c3f2

master



c866 a957

master

git commit

bug-37
git checkout -b bug 37
git commit
ce33

c866 a957

master

git commit

bug-37 git commit

ce33 1aee c3f2

c866 a957 8ecd 316f 1aee

master

git commit

ce33 1aee c3f2

c866 a957 8ecd 316f 1aee 1aee

git merge bug-37 master


��merge��
ce33 1aee c3f2
commit

c866 a957 8ecd 316f 1aee 1aee

git merge bug-37 master


Current branch

c866 a957 8ecd 316f 1aee c3f2

master


Current branch

HEAD

c866 a957 8ecd 316f 1aee c3f2

master


Current branch
commit HEAD

c866 a957 8ecd 316f 1aee c3f2

master


Current branch
bug-37

HEAD
ce33 1aee c3f2

c866 a957 8ecd 316f 1aee

master


Current branch
bug-37

ce33 1aee c3f2

c866 a957 8ecd 316f 1aee
HEAD

git checkout bug-37
master


work?ow


Topic Branch


Topic Branch
git checkout -b js-refactor

vim foo.js bar.js
git commit -a -m "delete weird codes"

vim foo.js bar.js
git commit -a -m "add good code."

git checkout master
git merge js-refactor

git pull
git push


branch from master,
merge to master.
css-refactor

master

bug-3414


Branch

rc - deploy to staging
release - deploy to production
master - dev trunk
(others) - dev topics


topic �� master �� rc �� release
(master) git checkout -b awesome-feature
# hack, hack, hack
git checkout master
git merge awesome-feature

git co rc
git merge master
# deploy. test staging

git co release
git merge rc
# deploy to production


stable master
(master) git checkout -b awesome-feature
# hack, hack, hack
(master) git checkout -b bug-fix-123
# hack, hack, hack

git checkout test
(test) git merge awesome-feature
(test) git merge bug-fix-123
# run QA tests
(test) git checkout master
(master) git merge test
# deploy master to production


? git help <command>
? gitready.com
? gitcasts.com


�ݺ�ߣ

Git

More Related Content

Git