What is Version Control? What is Git?

Size: px

Start display at page:

Download "What is Version Control? What is Git?"

炜冷
5 years ago
Views:

1 Git Littlebtc (Hsiao-Ting Yu) Scott Chacon Pro Git CC-BY-NC-SA-3.0

2 What is Version Control? What is Git?

4 Local rcs

5 Server Checkout Commit Subversion SVN Server

6 Server git, Mecurial (hg), bazaar (bzr) Branch

7 Git Linux Kernel ( Wikipedia contributors, CC-BY-SA)

8 From: Linux Kernel Development: How Fast it is Going, Who is Doing It, What They are Doing, and Who is Sponsoring It, Fair use(?)

9 先前的嘗試 BitKeeper Linus Torvalds 我就是不喜歡中央式的系統所以 Linux Kernel 以前的變更都是用 Patch + 壓縮檔來散布 2002年 Linus 採用 BitKeeper 分散版本控制系統專有社群不滿甚至嘗試逆向工程於是跟 BitKeeper 開發商鬧翻 Git 因此而生 (pic: CC-BYSA-3.0 & GFDL)

10 Git Linux Kernel And then realize that nothing is perfect. Git is just *closer* to perfect than any other SCM out there. -- Linus on Git mailing list

11 Git Basics

12 Git

13 Git...

14 Git Checksum Staging

15 Using Git

16 Git Repository Repository git init.git

17 Initial Commit README touch README git add. git commit -m 'Initial commit'

18 Repository Clone $ git clone Initialized empty Git repository in /Users/littlebtc/work/jquery/.git/ remote: Counting objects: 14043, done.remote: Compressing objects: 100% (4070/4070), done. remote: Total (delta 9717), reused (delta 9452) Receiving objects: 100% (14043/14043), MiB 288 KiB/s, done. Resolving deltas: 100% (9717/9717), done.

19 File Status git checkout -- filename git reset HEAD filename git add filename git add filename git rm filename git commit.gitignore.gitignore commit! git status

20 git status

21 Commit log git log (console) GitX (Mac) giggle (Linux) ( )

22 ...!? Commit git commit --amend Stage Unstage git reset HEAD file git checkout -- file

23 Remote Server!! Branch Remote Branch master Remote origin git pull origin = git fetch origin + git merge origin/master Merge git push origin master Master Push Origin

24 "Remote" Protocol file:// ssh:// git:// or

25 Branches

26 Commit git Commit

27 commit Commit Commit Snapshot Tree

28 branch commit

29 git branch testing "testing" branch git HEAD Branch

30 git checkout testing HEAD Testing Branch or git checkout -b testing Branch

31 Commit... testing master

32 git checkout master Master What's next?

33 git commit -m 'Change the master!'

34 Merge Rebase Push Rebase

35 Merge

36 Branch Bug hotfix branch master

37 git checkout master git merge hotfix master master hotfix Commit fast-foward

38 Branch Issue 53 branch Merge

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

40 CONFLICT git status git status git commit Merge Merge Commit Message

41 Rebase

42 Merge experiment branch?

43 git checkout experiment git rebase master C3 Rebase C4 (onto C4)

44 git checkout master git merge experiment Rebase fast-forward Merge

45 ...

46 git rebase --onto master server client client Branch client server master

47 git checkout master git merge client client fast-forward Merge

48 git rebase master server Branch server Branch master

49 git checkout master git merge server git branch -d client git branch -d server Merge Branch :)

千萬不要對已經Push的東西作Rebase 除非你想成為害群之馬 Pic: http://commons.wikimedia.

50 千萬不要對已經Push的東西作Rebase 除非你想成為害群之馬 Pic: Public Domain, United States Department of Energy

51 Remote Branches

52 Remote Branch Branch origin master origin/master git clone origin/master master

53 Remote Branch...

54 Pull = Fetch + Merge Origin Fetch Merge git pull git pull origin = git fetch origin git merge origin/master git merge origin/master b03ed

55 Remote

56 Fetch Remote Branch

57 Distributed Workflows

59 Commit/ Patch git diff --check Commit git add --patch Stage Commit Message

60 John 738ee Fetch Merge Push Jessica Branch Issue 54

61 Jessica Fetch Jessica John issue54 Fast-foward git checkout master git merge issue54 origin/master git merge origin/master Push

62 Branch Merge

63 A B Branch Rebase A Merge B

64 ... Still a lot to learn!

65 github... Open Source

66 Pro Git Git ihower Git archives/category/git

Git 原理简介 Git 是一种分布式版本控制系统每个克隆的仓库都包含有整个仓库的所有数据任何修改先提交在本地, 再推送到服务器创建和切换分支合并修改相当方便而且快速本文档中第一次出现的术语将以蓝色斜体标出术语的含义是单一的明确的不可替代的 1

Git 原理简介 Git 是一种分布式版本控制系统每个克隆的仓库都包含有整个仓库的所有数据任何修改先提交在本地, 再推送到服务器创建和切换分支合并修改相当方便而且快速本文档中第一次出现的术语将以蓝色斜体标出术语的含义是单一的明确的不可替代的 1 Git 原理简介 Git 是一种分布式版本控制系统每个克隆的仓库都包含有整个仓库的所有数据任何修改先提交在本地, 再推送到服务器创建和切换分支合并修改相当方便而且快速本文档中第一次出现的术语将以蓝色斜体标出术语的含义是单一的明确的不可替代的 1 Git 仓库结构举例 git@my.server:bob/my.git master A B C 2 Git 仓库结构相对本地已克隆的仓库而言,