{"id":381,"date":"2018-03-14T10:53:48","date_gmt":"2018-03-14T02:53:48","guid":{"rendered":"http:\/\/www.max-shu.com\/blog\/?p=381"},"modified":"2018-03-14T10:53:56","modified_gmt":"2018-03-14T02:53:56","slug":"git%e7%9a%84%e5%ae%89%e8%a3%85%e5%92%8c%e7%ae%80%e5%8d%95%e4%bd%bf%e7%94%a8","status":"publish","type":"post","link":"http:\/\/www.max-shu.com\/blog\/?p=381","title":{"rendered":"Git\u7684\u5b89\u88c5\u548c\u7b80\u5355\u4f7f\u7528"},"content":{"rendered":"
\u5b89\u88c5\uff1a<\/div>\n
# yum install curl-devel expat-devel gettext-devel openssl-devel zlib-devel\u00a0perl-devel<\/div>\n
<\/div>\n
# tar -zxvf git-2.2.0.tar.gz<\/div>\n
# cd git-2.2.0\/<\/div>\n
# .\/configure<\/div>\n
# make all<\/div>\n
# make install<\/div>\n
# git help<\/div>\n
<\/div>\n
\u914d\u7f6e\uff1a<\/div>\n
# git config -l –system<\/div>\n
\u5bf9\u5e94\u7684\u914d\u7f6e\u6587\u4ef6\uff1a<\/div>\n
# vi\u00a0\/usr\/local\/etc\/gitconfig<\/div>\n
<\/div>\n
# git config -l –global<\/div>\n
\u5bf9\u5e94\u7684\u914d\u7f6e\u6587\u4ef6\uff0c\u53ea\u4fee\u6539\u8be5\u7528\u6237\u7684\u914d\u7f6e\uff1a<\/div>\n
\n
# vi ~\/.gitconfig<\/div>\n<\/div>\n
\u914d\u7f6e\u7528\u6237\u4fe1\u606f\uff1a<\/div>\n
# git config –global user.name “Max Shu”<\/div>\n
# git config –global user.email maxshu_cn@163.com<\/div>\n
\u914d\u7f6e\u9ed8\u8ba4\u7f16\u8f91\u5668\uff1a<\/div>\n
# git config –global core.editor vi<\/div>\n
\u914d\u7f6e\u5dee\u5f02\u5206\u6790\u5de5\u5177\uff1a<\/div>\n
# git config –global merge.tool vimdiff<\/div>\n
\u67e5\u770b\u914d\u7f6e\uff08\u5f53\u7136\u53ef\u4ee5\u67e5\u770b\u90a3\u4e24\u4e2a\u914d\u7f6e\u6587\u4ef6\uff09\uff1a<\/div>\n
# git config -l
\nuser.name=Max Shu
\nuser.email=maxshu_cn@163.com
\ncore.editor=vi
\nmerge.tool=vimdiff<\/div>\n
\u67e5\u770b\u5177\u4f53\u7684\u67d0\u4e2a\u503c\uff1a<\/div>\n
# git config user.name
\nMax Shu<\/div>\n
<\/div>\n
\u5728\u5f53\u524d\u76ee\u5f55\u4e0b\u5efa\u7acb\u65b0\u7684\u672c\u5730\u4ed3\u5e93\uff0c\u4f1a\u751f\u6210 .git \u76ee\u5f55\uff0c\u91cc\u9762\u542b\u6709\u8be5\u4ed3\u5e93\u6240\u6709\u5185\u5bb9\uff1a<\/div>\n
# mkdir TEST<\/div>\n
# cd TEST<\/div>\n
# touch test.c<\/div>\n
# touch bbb.c<\/div>\n
# touch aaa.h<\/div>\n
# git init<\/div>\n
\u628a\u5f53\u524d\u76ee\u5f55\u4e0b\u7684\u67d0\u4e9b\u6587\u4ef6\u52a0\u5165\u4ed3\u5e93\uff1a<\/div>\n
# git add test.c<\/div>\n
# git add bbb.c<\/div>\n
# git add *.h<\/div>\n
<\/div>\n
\u5982\u679c\u589e\u52a0\u65f6\u9700\u8981\u5ffd\u7565\u67d0\u4e9b\u6587\u4ef6\uff0c\u5219\u5728\u8be5\u76ee\u5f55\u4e0b\u5efa\u7acb.gitignore\u6587\u4ef6\uff0c\u91cc\u9762\u653e\u7f6e\u9700\u5ffd\u7565\u7684\u6587\u4ef6\u540d\uff1a<\/div>\n
# vi .gitignore<\/div>\n
# \u6b64\u4e3a\u6ce8\u91ca \u2013 \u5c06\u88ab Git \u5ffd\u7565
\n# \u5ffd\u7565\u6240\u6709 .a \u7ed3\u5c3e\u7684\u6587\u4ef6
\n*.a
\n# \u4f46 lib.a \u9664\u5916
\n!lib.a
\n# \u4ec5\u4ec5\u5ffd\u7565\u9879\u76ee\u6839\u76ee\u5f55\u4e0b\u7684 TODO \u6587\u4ef6\uff0c\u4e0d\u5305\u62ec subdir\/TODO
\n\/TODO
\n# \u5ffd\u7565 build\/ \u76ee\u5f55\u4e0b\u7684\u6240\u6709\u6587\u4ef6
\nbuild\/
\n# \u4f1a\u5ffd\u7565 doc\/notes.txt \u4f46\u4e0d\u5305\u62ec doc\/server\/arch.txt
\ndoc\/*.txt
\n# ignore all .txt files in the doc\/ directory
\ndoc\/**\/*.txt<\/div>\n
<\/div>\n
\u63d0\u4ea4\u5230\u672c\u5730\u4ed3\u5e93\uff1a<\/div>\n
# git commit -m ‘initial version for TEST’<\/div>\n
<\/div>\n
\u514b\u9686\u4e00\u4e2a\u4ed3\u5e93\uff1a<\/div>\n
\u628a\u521a\u624d\u7684TEST\u514b\u9686\u6210TEST-clone\uff0c\u5982\u679c\u4e0d\u5e26TEST-clone\u53c2\u6570\uff0c\u5219\u4f7f\u7528\u76f8\u540c\u540d\u5b57\uff0c\u4f1a\u8986\u76d6\uff1a<\/div>\n
# cd ..<\/div>\n
# git clone .\/TEST .\/TEST-clone<\/div>\n
\u8fdc\u7a0b\u514b\u9686\uff1a<\/div>\n
# git clone\u00a0git:\/\/github.com\/schacon\/grit.git mygrit<\/div>\n
\n
# git clone http(s):\/\/github.com\/schacon\/grit.git mygrit<\/div>\n
\n
# git clone user@server:\/path.git mygrit<\/div>\n<\/div>\n<\/div>\n
\u00a0 \u00a0 \u00a0\u5de5\u4f5c\u76ee\u5f55\u4e0b\u9762\u7684\u6240\u6709\u6587\u4ef6\u90fd\u4e0d\u5916\u4e4e\u8fd9\u4e24\u79cd\u72b6\u6001\uff1a\u5df2\u8ddf\u8e2a\u6216\u672a\u8ddf\u8e2a\u3002\u5df2\u8ddf\u8e2a\u7684\u6587\u4ef6\u662f\u6307\u672c\u6765\u5c31\u88ab\u7eb3\u5165\u7248\u672c\u63a7\u5236\u7ba1\u7406\u7684\u6587\u4ef6\uff0c\u5728\u4e0a\u6b21\u5feb\u7167\u4e2d\u6709\u5b83\u4eec\u7684\u8bb0\u5f55\uff0c\u5de5\u4f5c\u4e00\u6bb5\u65f6\u95f4\u540e\uff0c\u5b83\u4eec\u7684\u72b6\u6001\u53ef\u80fd\u662f\u672a\u66f4\u65b0\uff0c\u5df2\u4fee\u6539\u6216\u8005\u5df2\u653e\u5165\u6682\u5b58\u533a\u3002\u800c\u6240\u6709\u5176\u4ed6\u6587\u4ef6\u90fd\u5c5e\u4e8e\u672a\u8ddf\u8e2a\u6587\u4ef6\u3002\u5b83\u4eec\u65e2\u6ca1\u6709\u4e0a\u6b21\u66f4\u65b0\u65f6\u7684\u5feb\u7167\uff0c\u4e5f\u4e0d\u5728\u5f53\u524d\u7684\u6682\u5b58\u533a\u57df\u3002\u521d\u6b21\u514b\u9686\u67d0\u4e2a\u4ed3\u5e93\u65f6\uff0c\u5de5\u4f5c\u76ee\u5f55\u4e2d\u7684\u6240\u6709\u6587\u4ef6\u90fd\u5c5e\u4e8e\u5df2\u8ddf\u8e2a\u6587\u4ef6\uff0c\u4e14\u72b6\u6001\u4e3a\u672a\u4fee\u6539\u3002<\/div>\n
\u00a0 \u00a0 \u00a0\u5728\u7f16\u8f91\u8fc7\u67d0\u4e9b\u6587\u4ef6\u4e4b\u540e\uff0cGit \u5c06\u8fd9\u4e9b\u6587\u4ef6\u6807\u4e3a\u5df2\u4fee\u6539\u3002\u6211\u4eec\u9010\u6b65\u628a\u8fd9\u4e9b\u4fee\u6539\u8fc7\u7684\u6587\u4ef6\u653e\u5230\u6682\u5b58\u533a\u57df\uff0c\u76f4\u5230\u6700\u540e\u4e00\u6b21\u6027\u63d0\u4ea4\u6240\u6709\u8fd9\u4e9b\u6682\u5b58\u8d77\u6765\u7684\u6587\u4ef6\uff0c\u5982\u6b64\u91cd\u590d\uff1a<\/div>\n
<\/div>\n
<\/div>\n
\u67e5\u770b\u5f53\u524d\u5de5\u4f5c\u76ee\u5f55\u72b6\u6001\uff1a<\/div>\n
# git status
\nOn branch master
\nYour branch is up-to-date with ‘origin\/master’.
\nnothing to commit, working directory clean<\/div>\n
\u8868\u793a\u5206\u652f\u4e3amaster\uff0c\u5de5\u4f5c\u76ee\u5f55\u5f88\u5e72\u51c0\uff0c\u6240\u6709\u6587\u4ef6\u90fd\u5df2\u63d0\u4ea4\u3002<\/div>\n
<\/div>\n
\u589e\u52a0\u4e00\u6587\u4ef6\uff0c\u770b\u72b6\u6001\uff0c\u8fd9\u65f6\u6587\u4ef6\u4e3auntracked\uff08\u672a\u8ddf\u8e2a\u72b6\u6001\uff09\uff1a<\/div>\n
# touch readme<\/div>\n
# git status
\nOn branch master
\nYour branch is up-to-date with ‘origin\/master’.
\nUntracked files:
\n(use “git add <file>…” to include in what will be committed)
\nreadme
\nnothing added to commit but untracked files present (use “git add” to track)<\/div>\n
\u8fd9\u91cc\u6709\u4e00\u4e2auntracked\u7684\u6587\u4ef6\uff0c\u5c31\u662f\u521a\u521a\u5efa\u7acb\u7684\u8fd9\u4e2a\u3002<\/div>\n
<\/div>\n
\u628a\u65b0\u5efa\u7684\u6587\u4ef6\u52a0\u5165\u8ddf\u8e2a\uff0c\u8fdb\u5165stage\uff08\u6682\u5b58\uff09\u72b6\u6001\uff1a<\/div>\n
# git add readme<\/div>\n
# git status
\nOn branch master
\nYour branch is up-to-date with ‘origin\/master’.
\nChanges to be committed:
\n(use “git reset HEAD <file>…” to unstage)
\nnew file:\u00a0\u00a0 readme<\/div>\n
<\/div>\n
\u4fee\u6539\u6587\u4ef6\u8fdb\u5165modified\uff08\u5df2\u4fee\u6539\uff09\u72b6\u6001\uff1a<\/div>\n
# vi test.c<\/div>\n
# git status
\nOn branch master
\nYour branch is up-to-date with ‘origin\/master’.
\nChanges to be committed:
\n(use “git reset HEAD <file>…” to unstage)
\nnew file:\u00a0\u00a0 readme
\nChanges not staged for commit:
\n(use “git add <file>…” to update what will be committed)
\n(use “git checkout — <file>…” to discard changes in working directory)
\nmodified:\u00a0\u00a0 test.c<\/div>\n
<\/div>\n
\u5df2\u4fee\u6539\u8fc7\u7684\u6587\u4ef6\u9700\u8981\u518d\u6b21add\uff0c\u8fdb\u5165stage\uff08\u5df2\u6682\u5b58\uff09\u72b6\u6001\uff1a<\/div>\n
# git add test.c<\/div>\n
# git status
\nOn branch master
\nYour branch is up-to-date with ‘origin\/master’.
\nChanges to be committed:
\n(use “git reset HEAD <file>…” to unstage)
\nnew file:\u00a0\u00a0 readme
\nmodified:\u00a0\u00a0 test.c<\/div>\n
<\/div>\n
\u67e5\u770b\u5df2\u6682\u5b58(staged)<\/b>\u548c\u5df2\u4fee\u6539(modified)<\/b>\u6587\u4ef6\u7684\u5177\u4f53\u4e0d\u540c\u4e4b\u5904\uff1a<\/div>\n
# vi test.c<\/div>\n
# git status
\nOn branch master
\nYour branch is up-to-date with ‘origin\/master’.
\nChanges to be committed:
\n(use “git reset HEAD <file>…” to unstage)
\nnew file:\u00a0\u00a0 readme
\nmodified:\u00a0\u00a0 test.c
\nChanges not staged for commit:
\n(use “git add <file>…” to update what will be committed)
\n(use “git checkout — <file>…” to discard changes in working directory)
\nmodified:\u00a0\u00a0 test.c<\/div>\n
# git diff
\ndiff –git a\/test.c b\/test.c
\nindex be532d9..da2faa0 100644
\n— a\/test.c
\n+++ b\/test.c
\n@@ -2,3 +2,4 @@ aaa
\nbbb
\nccc
\neee
\n+fff<\/div>\n
<\/div>\n
\u67e5\u770b\u5df2\u6682\u5b58(staged)<\/b>\u6587\u4ef6\u548c\u5df2\u63d0\u4ea4(commited)<\/b>\u6587\u4ef6\u4e4b\u95f4\u7684\u5177\u4f53\u5dee\u522b\uff1a<\/div>\n
# git diff –staged
\ndiff –git a\/readme b\/readme
\nnew file mode 100644
\nindex 0000000..e69de29
\ndiff –git a\/test.c b\/test.c
\nindex 1802a74..be532d9 100644
\n— a\/test.c
\n+++ b\/test.c
\n@@ -1,3 +1,4 @@
\naaa
\nbbb
\nccc
\n+eee<\/div>\n
<\/div>\n
\u628a\u5df2\u6682\u5b58\u7684\u6587\u4ef6\u63d0\u4ea4\u5230\u4ed3\u5e93\uff1a<\/div>\n
# git commit -m “ddd”
\n[master ebae8cf] ddd
\n2 files changed, 1 insertion(+)
\ncreate mode 100644 readme<\/div>\n
\u628a\u5df2\u4fee\u6539\u3001\u5df2\u6682\u5b58\u7684\u6587\u4ef6\u4e00\u8d77\u63d0\u4ea4\uff1a<\/div>\n
# git commit -a -m “ddd”<\/div>\n
<\/div>\n
\u5220\u9664\u6587\u4ef6\uff1a<\/div>\n
# git rm readme<\/div>\n
# git status
\nOn branch master
\nYour branch is ahead of ‘origin\/master’ by 2 commits.
\n(use “git push” to publish your local commits)
\nChanges to be committed:
\n(use “git reset HEAD <file>…” to unstage)
\ndeleted:\u00a0\u00a0\u00a0 readme<\/div>\n
\u518d\u63d0\u4ea4\uff0c\u5c31\u4ece\u4ed3\u5e93\u5220\u9664\u4e86\uff1a<\/div>\n
# git commit -m “a”<\/div>\n
\u5220\u9664\u901a\u914d\u7b26(git\u4f7f\u7528\u81ea\u5df1\u7684\u89c4\u5219\uff0c\u4e0d\u80fd\u7528shell\u89c4\u5219)\uff1a<\/div>\n
# git rm\u00a0log\/\\*.log<\/div>\n
<\/div>\n
\u79fb\u52a8\u6587\u4ef6\uff1a<\/div>\n
# git mv bbb.c ccc.c
\n# git status
\nOn branch master
\nYour branch is ahead of ‘origin\/master’ by 3 commits.
\n(use “git push” to publish your local commits)
\nChanges to be committed:
\n(use “git reset HEAD <file>…” to unstage)
\nrenamed:\u00a0\u00a0\u00a0 bbb.c -> ccc.c<\/div>\n
\u518d\u63d0\u4ea4\uff0c\u5c31\u4ece\u4ed3\u5e93\u79fb\u52a8\u4e86\uff1a<\/div>\n
# git commit -m “a”<\/div>\n
<\/div>\n
\u67e5\u770b\u63d0\u4ea4\u5386\u53f2\uff1a<\/b><\/div>\n
# git log<\/div>\n
# git log -p -2<\/div>\n
\u5176\u4e2d-p\u663e\u793a\u6bcf\u6b21\u63d0\u4ea4\u7684\u5185\u5bb9\u5dee\u5f02\uff0c-2\u8868\u793a\u6700\u8fd1\u76842\u6b21\u66f4\u65b0\u3002<\/div>\n
# git log –stat<\/div>\n
\u8fd9\u91cc–stat\u663e\u793a\u6bcf\u6b21\u63d0\u4ea4\u7684\u7edf\u8ba1\u7ed3\u679c\u3002<\/div>\n
\u590d\u6742\u4f8b\u5b50\uff1a<\/div>\n
git log –pretty=”%h – %s” –author=gitster –since=”2008-10-01″ –before=”2008-11-01″ –no-merges — t\/<\/div>\n
<\/div>\n
\u91cd\u65b0\u63d0\u4ea4\uff08\u5982\u679c\u4e4b\u524d\u63d0\u4ea4\u7684\u6709\u95ee\u9898\uff0c\u5219\u91cd\u65b0\u63d0\u4ea4\u4e00\u6b21\uff09\uff1a<\/div>\n
# git commit –amend<\/div>\n
<\/div>\n
\u5982\u679c\u5230\u4e86\u6682\u5b58\u533a\u7684\u6587\u4ef6\uff0c\u600e\u4e48\u53d6\u6d88\uff1a<\/div>\n
# git reset HEAD bbb.c<\/div>\n
<\/div>\n
\u53d6\u6d88\u4fee\u6539\uff0c\u91cd\u65b0\u4ece\u4ed3\u5e93\u53d6\u4e0b\u6765\u4e4b\u524d\u7684\u6587\u4ef6\uff1a<\/div>\n
# git checkout — ccc.c<\/div>\n
<\/div>\n
<\/div>\n
\u5efa\u7acb\u8fdc\u7a0b\u4ed3\u5e93\uff1a<\/b><\/div>\n
\u4ece\u8fdc\u7a0b\u4ed3\u5e93\u514b\u9686\u5230\u672c\u5730\u7684\u56db\u79cd\u65b9\u5f0f\uff1a<\/div>\n
# git clone\u00a0file:\/\/\/opt\/git\/project.git<\/div>\n
# git clone git:\/\/server\/project.git<\/div>\n
# git clone ssh:\/\/user@server\/project.git<\/div>\n
# git clone http:\/\/example.com\/gitproject.git<\/div>\n
<\/div>\n
\u628a\u672c\u5730\u76ee\u5f55\u653e\u5230\u8fdc\u7a0b\u4f5c\u4e3a\u8fdc\u7a0b\u521d\u59cb\u4ed3\u5e93\uff1a<\/div>\n
# git remote add local_proj \/opt\/git\/project.git<\/div>\n
<\/div>\n
\u90e8\u7f72\u8fdc\u7a0b\u4ed3\u5e93\uff1a<\/div>\n
1. \u628a\u672c\u5730git\u4ed3\u5e93\u514b\u9686\u6210\u88f8\u4ed3\u5e93\uff1a<\/div>\n
# git clone –bare TEST test.git<\/div>\n
2. \u628a\u88f8\u4ed3\u5e93\u590d\u5236\u5230\u670d\u52a1\u5668\u4e0a\uff1a<\/div>\n
# scp -r test.git root@192.168.56.101:\/opt\/git\/<\/div>\n
3. \u4fee\u6539\u6743\u9650\uff0c\u8ba9\u4ed6\u53ef\u4ee5\u88ab\u5176\u4ed6\u7528\u6237\u63a8\u9001\uff1a<\/div>\n
# ssh\u00a0root@192.168.56.101<\/a><\/div>\n
# cd \/opt\/git\/test.git\/<\/div>\n
# git init –bare –shared<\/div>\n
# exit<\/div>\n
4. \u6d4b\u8bd5\u4e00\u4e0b\uff1a<\/div>\n
# git clone root@192.168.56.101:\/opt\/git\/test.git aaa<\/div>\n
# cd aaa<\/div>\n
# git remote -v
\norigin\u00a0 root@192.168.56.101:\/opt\/git\/test.git (fetch)
\norigin\u00a0 root@192.168.56.101:\/opt\/git\/test.git (push)<\/div>\n
<\/div>\n
<\/div>\n
\u67e5\u770b\u8fdc\u7a0b\u4ed3\u5e93\uff1a<\/div>\n
# git remote -v<\/div>\n
<\/div>\n
\u589e\u52a0\u4e00\u4e2a\u8fdc\u7a0b\u4ed3\u5e93\u5230\u672c\u5730\u76ee\u5f55\uff1a<\/div>\n
# git remote add pb git:\/\/github.com\/paulboone\/ticgit.git<\/div>\n
\u5176\u4e2dpb\u4e3a\u522b\u540d\uff0c\u540e\u9762\u4e3a\u8fdc\u7a0b\u5730\u5740\uff0c\u5982\u679c\u4e0d\u52a0pb\uff0c\u5219\u4e3a\u9ed8\u8ba4\u7684origin\u540d\u5b57\u3002<\/div>\n
<\/div>\n
\u628a\u8fdc\u7a0b\u4ed3\u5e93\u7684\u5185\u5bb9\u53d6\u5230\u672c\u5730\u76ee\u5f55\uff1a<\/div>\n
# git fetch pb<\/div>\n
\u8fd9\u91cc\u7684fetch\u53ea\u80fd\u6293\u8fdc\u7a0b\u7684\u5305\u5230\u672c\u5730\uff0c\u4e0d\u80fd\u81ea\u52a8\u5408\u5e76\u5230\u5f53\u524d\u5de5\u4f5c\u5206\u652f\uff0c\u5982\u679c\u8981\u81ea\u52a8\u5408\u5e76\uff0c\u53ef\u4ee5\u4f7f\u7528git pull\u547d\u4ee4\u3002<\/div>\n
<\/div>\n
\u628a\u672c\u5730\u4ed3\u5e93\u7684\u66f4\u65b0\u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93\uff1a<\/div>\n
#git push origin master<\/div>\n
\u8fd9\u91cc\u7684origin\u548cmaster\u4e3a\u9ed8\u8ba4\u7684\u8fdc\u7a0b\u540d\u5b57\u548c\u5206\u652f\u540d\u5b57\u3002<\/div>\n
\u53ef\u80fd\u9519\u8bef\uff1a<\/div>\n
To git@192.168.1.X:\/var\/git.server\/…\/web<\/div>\n
! [remote rejected] master -> master (branch is currently checked out)<\/div>\n
error: failed to push some refs to ‘git@192.168.1.X:\/var\/git.server\/…\/web’<\/div>\n
\u8fd9\u662f\u7531\u4e8egit\u9ed8\u8ba4\u62d2\u7edd\u4e86push\u64cd\u4f5c\uff0c\u9700\u8981\u8fdb\u884c\u8bbe\u7f6e\uff0c\u4fee\u6539.git\/config\u6dfb\u52a0\u5982\u4e0b\u4ee3\u7801\uff1a<\/div>\n
[receive] denyCurrentBranch = ignore<\/div>\n
\u5728\u521d\u59cb\u5316\u8fdc\u7a0b\u4ed3\u5e93\u65f6\u6700\u597d\u4f7f\u7528<\/div>\n
git –bare init<\/div>\n
\u800c\u4e0d\u8981\u4f7f\u7528\uff1a<\/div>\n
git init<\/div>\n
\u5982\u679c\u4f7f\u7528\u4e86git init\u521d\u59cb\u5316\uff0c\u5219\u8fdc\u7a0b\u4ed3\u5e93\u7684\u76ee\u5f55\u4e0b\uff0c\u4e5f\u5305\u542bwork tree\uff0c\u5f53\u672c\u5730\u4ed3\u5e93\u5411\u8fdc\u7a0b\u4ed3\u5e93push\u65f6, \u5982\u679c\u8fdc\u7a0b\u4ed3\u5e93\u6b63\u5728push\u7684\u5206\u652f\u4e0a\uff08\u5982\u679c\u5f53\u65f6\u4e0d\u5728push\u7684\u5206\u652f\uff0c\u5c31\u6ca1\u6709\u95ee\u9898\uff09, \u90a3\u4e48push\u540e\u7684\u7ed3\u679c\u4e0d\u4f1a\u53cd\u5e94\u5728work tree\u4e0a, \u4e5f\u5373\u5728\u8fdc\u7a0b\u4ed3\u5e93\u7684\u76ee\u5f55\u4e0b\u5bf9\u5e94\u7684\u6587\u4ef6\u8fd8\u662f\u4e4b\u524d\u7684\u5185\u5bb9\uff0c\u5fc5\u987b\u5f97\u4f7f\u7528git reset –hard\u624d\u80fd\u770b\u5230push\u540e\u7684\u5185\u5bb9.<\/div>\n
<\/div>\n
\u67e5\u770b\u8fdc\u7a0b\u4ed3\u5e93\u72b6\u6001\uff1a<\/div>\n
# git remote show origin<\/div>\n
<\/div>\n
\u4fee\u6539\u8fdc\u7a0b\u4ed3\u5e93\u5728\u672c\u5730\u7684\u6635\u79f0\uff1a<\/div>\n
# git remote rename pb paul<\/div>\n
<\/div>\n
\u8fdc\u7a0b\u4ed3\u5e93\u5df2\u7ecf\u8fc1\u79fb\u6216\u514b\u9686\u955c\u50cf\u4e0d\u518d\u4f7f\u7528\uff0c\u5219\u5220\u9664\u8fdc\u7a0b\u4ed3\u5e93\u5728\u672c\u5730\u7684\u4fe1\u606f\uff1a<\/div>\n
# git remote rm paul<\/div>\n
<\/div>\n
\u67e5\u770b\u73b0\u6709\u6807\u7b7e\u4fe1\u606f\uff1a<\/div>\n
# git tag<\/div>\n
<\/div>\n
\u6253\u65b0\u7684\u6807\u7b7e\uff1a<\/div>\n
# git tag -a v1.4 -m ‘my version 1.4’<\/div>\n
<\/div>\n
\u67e5\u770b\u5177\u4f53\u6807\u7b7e\u4fe1\u606f\uff1a<\/div>\n
# git show v1.4<\/div>\n
<\/div>\n
\u4ea7\u751f\u5e26\u6709\u7b7e\u7f72\u4fe1\u606f\u7684\u6807\u7b7e\uff1a<\/div>\n
# gpg –gen-key<\/div>\n
\u8fd9\u91cc\u9700\u8981\u7b49\u597d\u4e45\u53bb\u5b8c\u6210\u3002<\/div>\n
\n
# gpg –list-key<\/div>\n
\/root\/.gnupg\/pubring.gpg
\n————————
\npub\u00a0\u00a0 2048R\/44E52FC9 2014-12-06
\nuid\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0 Max Shu (No.1 key) <maxshu_cn@163.com>
\nsub\u00a0\u00a0 2048R\/BD2825FC 2014-12-06<\/div>\n

# git config –global user.name “Max Shu (No.1 key)”<\/p>\n<\/div>\n

\u6ce8\u610f\u8fd9\u91cc\u7684\u540d\u5b57\u548c\u4e0a\u9762\u7684uid\u540d\u5b57\u7684\u4e00\u81f4\uff0c\u4e0d\u5e26email\u5730\u5740\uff0c\u4f46\u662f\u542b\u6709PGP\u7684comment\u3002<\/div>\n
# git tag -s v1.5 -m ‘my signed 1.5 tag’<\/div>\n
<\/div>\n
\u6821\u9a8c\u6807\u7b7e\uff1a<\/div>\n
# git tag -v v1.5<\/div>\n
<\/div>\n
\u628a\u6807\u7b7e\u63a8\u9001\u5230\u8fdc\u7a0b\u670d\u52a1\u5668\uff1a<\/div>\n
\u67d0\u4e2a\u6807\u7b7e\uff1a<\/div>\n
# git push origin v1.4<\/div>\n
\u6240\u6709\u6807\u7b7e\uff1a<\/div>\n
# git push orgin –tags<\/div>\n
<\/div>\n
<\/div>\n
\u4ee3\u7801\u53d1\u5e03\uff1a<\/div>\n
# git archive master –prefix=’project\/’ | gzip > `git describe master`.tar.gz<\/div>\n
# git archive master –prefix=’project\/’ –format=zip > `git describe master`.zip<\/div>\n
<\/div>\n
\u50a8\u85cf\u5de5\u4f5c\uff1a<\/div>\n
\u5982\u679c\u6b63\u5728\u5de5\u4f5c\uff0c\u53c8\u8981\u5230\u65b0\u7684\u5206\u652f\u505a\u67d0\u4e2a\u64cd\u4f5c\uff0c\u5219\u53ef\u4ee5\u4e34\u65f6\u50a8\u85cf\u6ca1\u6709\u63d0\u4ea4\u7684\u6587\u4ef6\uff1a<\/div>\n
# git stash<\/div>\n
\u7136\u540e\u5207\u6362\u5230\u522b\u7684\u5206\u652f\uff0c\u5904\u7406\u5b8c\u540e\u518d\u5207\u6362\u56de\u6765\uff1a<\/div>\n
# git stash list<\/div>\n
stash@{0}: WIP on master: 049d078 added the index file<\/div>\n
stash@{1}: WIP on master: c264051… Revert “added file_size”<\/div>\n
stash@{2}: WIP on master: 21d80a5… added number to log<\/div>\n
# git stash apply –index<\/div>\n
# git stash apply\u00a0stash@{1} –index<\/div>\n
\u5207\u6362\u56de\u6765\u540e\u5220\u9664\u50a8\u85cf\uff1a<\/div>\n
# git stash drop stash@{1}<\/div>\n
<\/div>\n
<\/div>\n
<\/div>\n
\n

\u5206\u652f\u7684\u65b0\u5efa\u4e0e\u5408\u5e76<\/h1>\n

\u73b0\u5728\u8ba9\u6211\u4eec\u6765\u770b\u4e00\u4e2a\u7b80\u5355\u7684\u5206\u652f\u4e0e\u5408\u5e76\u7684\u4f8b\u5b50\uff0c\u5b9e\u9645\u5de5\u4f5c\u4e2d\u5927\u4f53\u4e5f\u4f1a\u7528\u5230\u8fd9\u6837\u7684\u5de5\u4f5c\u6d41\u7a0b\uff1a<\/p>\n

    \n
  1. \u5f00\u53d1\u67d0\u4e2a\u7f51\u7ad9\u3002<\/li>\n
  2. \u4e3a\u5b9e\u73b0\u67d0\u4e2a\u65b0\u7684\u9700\u6c42\uff0c\u521b\u5efa\u4e00\u4e2a\u5206\u652f\u3002<\/li>\n
  3. \u5728\u8fd9\u4e2a\u5206\u652f\u4e0a\u5f00\u5c55\u5de5\u4f5c\u3002<\/li>\n<\/ol>\n

    \u5047\u8bbe\u6b64\u65f6\uff0c\u4f60\u7a81\u7136\u63a5\u5230\u4e00\u4e2a\u7535\u8bdd\u8bf4\u6709\u4e2a\u5f88\u4e25\u91cd\u7684\u95ee\u9898\u9700\u8981\u7d27\u6025\u4fee\u8865\uff0c\u90a3\u4e48\u53ef\u4ee5\u6309\u7167\u4e0b\u9762\u7684\u65b9\u5f0f\u5904\u7406\uff1a<\/p>\n

      \n
    1. \u8fd4\u56de\u5230\u539f\u5148\u5df2\u7ecf\u53d1\u5e03\u5230\u751f\u4ea7\u670d\u52a1\u5668\u4e0a\u7684\u5206\u652f\u3002<\/li>\n
    2. \u4e3a\u8fd9\u6b21\u7d27\u6025\u4fee\u8865\u5efa\u7acb\u4e00\u4e2a\u65b0\u5206\u652f\uff0c\u5e76\u5728\u5176\u4e2d\u4fee\u590d\u95ee\u9898\u3002<\/li>\n
    3. \u901a\u8fc7\u6d4b\u8bd5\u540e\uff0c\u56de\u5230\u751f\u4ea7\u670d\u52a1\u5668\u6240\u5728\u7684\u5206\u652f\uff0c\u5c06\u4fee\u8865\u5206\u652f\u5408\u5e76\u8fdb\u6765\uff0c\u7136\u540e\u518d\u63a8\u9001\u5230\u751f\u4ea7\u670d\u52a1\u5668\u4e0a\u3002<\/li>\n
    4. \u5207\u6362\u5230\u4e4b\u524d\u5b9e\u73b0\u65b0\u9700\u6c42\u7684\u5206\u652f\uff0c\u7ee7\u7eed\u5de5\u4f5c\u3002<\/li>\n<\/ol>\n

      \u5206\u652f\u7684\u65b0\u5efa\u4e0e\u5207\u6362<\/h2>\n

      \u9996\u5148\uff0c\u6211\u4eec\u5047\u8bbe\u4f60\u6b63\u5728\u9879\u76ee\u4e2d\u6109\u5feb\u5730\u5de5\u4f5c\uff0c\u5e76\u4e14\u5df2\u7ecf\u63d0\u4ea4\u4e86\u51e0\u6b21\u66f4\u65b0\uff08\u89c1\u56fe 3-10\uff09\u3002<\/p>\n

      \u56fe 3-10. \u4e00\u4e2a\u7b80\u77ed\u7684\u63d0\u4ea4\u5386\u53f2<\/p>\n

      \u73b0\u5728\uff0c\u4f60\u51b3\u5b9a\u8981\u4fee\u8865\u95ee\u9898\u8ffd\u8e2a\u7cfb\u7edf\u4e0a\u7684 #53 \u95ee\u9898\u3002\u987a\u5e26\u8bf4\u660e\u4e0b\uff0cGit \u5e76\u4e0d\u540c\u4efb\u4f55\u7279\u5b9a\u7684\u95ee\u9898\u8ffd\u8e2a\u7cfb\u7edf\u6253\u4ea4\u9053\u3002\u8fd9\u91cc\u4e3a\u4e86\u8bf4\u660e\u8981\u89e3\u51b3\u7684\u95ee\u9898\uff0c\u624d\u628a\u65b0\u5efa\u7684\u5206\u652f\u53d6\u540d\u4e3a iss53\u3002\u8981\u65b0\u5efa\u5e76\u5207\u6362\u5230\u8be5\u5206\u652f\uff0c\u8fd0\u884c\u53c2\u6570\uff1a<\/p>\n

      $ git checkout -b iss53\r\nSwitched to a new branch 'iss53'\r\n\u8fd9\u76f8\u5f53\u4e8e\u6267\u884c\u4e0b\u9762\u8fd9\u4e24\u6761\u547d\u4ee4\uff1a<\/pre>\n
      $ git branch iss53\r\n$ git checkout iss53\r\n\u56fe 3-11 \u793a\u610f\u8be5\u547d\u4ee4\u7684\u6267\u884c\u7ed3\u679c\u3002<\/pre>\n
      \u56fe 3-11. \u521b\u5efa\u4e86\u4e00\u4e2a\u65b0\u5206\u652f\u7684\u6307\u9488<\/p>\n
      \u63a5\u7740\u4f60\u5f00\u59cb\u5c1d\u8bd5\u4fee\u590d\u95ee\u9898\uff0c\u5728\u63d0\u4ea4\u4e86\u82e5\u5e72\u6b21\u66f4\u65b0\u540e\uff0c\u5206\u652f\u7684\u6307\u9488\u4e5f\u4f1a\u968f\u7740\u5411\u524d\u63a8\u8fdb\uff0c\u56e0\u4e3a\u5b83\u5c31\u662f\u5f53\u524d\u5206\u652f\uff08\u6362\u53e5\u8bdd\u8bf4\uff0c\u5f53\u524d\u7684HEAD\u00a0\u6307\u9488\u6b63\u6307\u5411iss53\uff0c\u89c1\u56fe 3-12\uff09\uff1a<\/p>\n
      $ vim index.html\r\n$ git commit -a -m 'added a new footer [issue 53]'\r\n\u56fe 3-12. iss53 \u5206\u652f\u968f\u5de5\u4f5c\u8fdb\u5c55\u5411\u524d\u63a8\u8fdb<\/pre>\n
      \u73b0\u5728\u4f60\u5c31\u63a5\u5230\u4e86\u90a3\u4e2a\u7f51\u7ad9\u95ee\u9898\u7684\u7d27\u6025\u7535\u8bdd\uff0c\u9700\u8981\u9a6c\u4e0a\u4fee\u8865\u3002\u6709\u4e86 Git \uff0c\u6211\u4eec\u5c31\u4e0d\u9700\u8981\u540c\u65f6\u53d1\u5e03\u8fd9\u4e2a\u8865\u4e01\u548ciss53\u00a0\u91cc\u4f5c\u51fa\u7684\u4fee\u6539\uff0c\u4e5f\u4e0d\u9700\u8981\u5728\u521b\u5efa\u548c\u53d1\u5e03\u8be5\u8865\u4e01\u5230\u670d\u52a1\u5668\u4e4b\u524d\u82b1\u8d39\u5927\u529b\u6c14\u6765\u590d\u539f\u8fd9\u4e9b\u4fee\u6539\u3002\u552f\u4e00\u9700\u8981\u7684\u4ec5\u4ec5\u662f\u5207\u6362\u56demaster\u5206\u652f\u3002<\/p>\n
      \u4e0d\u8fc7\u5728\u6b64\u4e4b\u524d\uff0c\u7559\u5fc3\u4f60\u7684\u6682\u5b58\u533a\u6216\u8005\u5de5\u4f5c\u76ee\u5f55\u91cc\uff0c\u90a3\u4e9b\u8fd8\u6ca1\u6709\u63d0\u4ea4\u7684\u4fee\u6539\uff0c\u5b83\u4f1a\u548c\u4f60\u5373\u5c06\u68c0\u51fa\u7684\u5206\u652f\u4ea7\u751f\u51b2\u7a81\u4ece\u800c\u963b\u6b62 Git \u4e3a\u4f60\u5207\u6362\u5206\u652f\u3002\u5207\u6362\u5206\u652f\u7684\u65f6\u5019\u6700\u597d\u4fdd\u6301\u4e00\u4e2a\u6e05\u6d01\u7684\u5de5\u4f5c\u533a\u57df\u3002\u7a0d\u540e\u4f1a\u4ecb\u7ecd\u51e0\u4e2a\u7ed5\u8fc7\u8fd9\u79cd\u95ee\u9898\u7684\u529e\u6cd5\uff08\u5206\u522b\u53eb\u505a stashing \u548c commit amending\uff09\u3002\u76ee\u524d\u5df2\u7ecf\u63d0\u4ea4\u4e86\u6240\u6709\u7684\u4fee\u6539\uff0c\u6240\u4ee5\u63a5\u4e0b\u6765\u53ef\u4ee5\u6b63\u5e38\u8f6c\u6362\u5230master\u5206\u652f\uff1a<\/p>\n
      $ git checkout master\r\nSwitched to branch 'master'\r\n\u6b64\u65f6\u5de5\u4f5c\u76ee\u5f55\u4e2d\u7684\u5185\u5bb9\u548c\u4f60\u5728\u89e3\u51b3\u95ee\u9898 #53 \u4e4b\u524d\u4e00\u6a21\u4e00\u6837\uff0c\u4f60\u53ef\u4ee5\u96c6\u4e2d\u7cbe\u529b\u8fdb\u884c\u7d27\u6025\u4fee\u8865\u3002\u8fd9\u4e00\u70b9\u503c\u5f97\u7262\u8bb0\uff1aGit \u4f1a\u628a\u5de5\u4f5c\u76ee\u5f55\u7684\u5185\u5bb9\u6062\u590d\u4e3a\u68c0\u51fa\u67d0\u5206\u652f\u65f6\u5b83\u6240\u6307\u5411\u7684\u90a3\u4e2a\u63d0\u4ea4\u5bf9\u8c61\u7684\u5feb\u7167\u3002\u5b83\u4f1a\u81ea\u52a8\u6dfb\u52a0\u3001\u5220\u9664\u548c\u4fee\u6539\u6587\u4ef6\u4ee5\u786e\u4fdd\u76ee\u5f55\u7684\u5185\u5bb9\u548c\u4f60\u5f53\u65f6\u63d0\u4ea4\u65f6\u5b8c\u5168\u4e00\u6837\u3002<\/pre>\n
      \u63a5\u4e0b\u6765\uff0c\u4f60\u5f97\u8fdb\u884c\u7d27\u6025\u4fee\u8865\u3002\u6211\u4eec\u521b\u5efa\u4e00\u4e2a\u7d27\u6025\u4fee\u8865\u5206\u652fhotfix\u00a0\u6765\u5f00\u5c55\u5de5\u4f5c\uff0c\u76f4\u5230\u641e\u5b9a\uff08\u89c1\u56fe 3-13\uff09\uff1a<\/p>\n
      $ git checkout -b hotfix\r\nSwitched to a new branch 'hotfix'\r\n$ vim index.html\r\n$ git commit -a -m 'fixed the broken email address'\r\n[hotfix 3a0874c] fixed the broken email address\r\n 1 files changed, 1 deletion(-)\r\n\u56fe 3-13. hotfix \u5206\u652f\u662f\u4ece master \u5206\u652f\u6240\u5728\u70b9\u5206\u5316\u51fa\u6765\u7684<\/pre>\n
      \u6709\u5fc5\u8981\u4f5c\u4e9b\u6d4b\u8bd5\uff0c\u786e\u4fdd\u4fee\u8865\u662f\u6210\u529f\u7684\uff0c\u7136\u540e\u56de\u5230master\u5206\u652f\u5e76\u628a\u5b83\u5408\u5e76\u8fdb\u6765\uff0c\u7136\u540e\u53d1\u5e03\u5230\u751f\u4ea7\u670d\u52a1\u5668\u3002\u7528git merge\u547d\u4ee4\u6765\u8fdb\u884c\u5408\u5e76\uff1a<\/p>\n
      $ git checkout master\r\n$ git merge hotfix\r\nUpdating f42c576..3a0874c\r\nFast-forward\r\n README | 1 -\r\n 1 file changed, 1 deletion(-)\r\n\u8bf7\u6ce8\u610f\uff0c\u5408\u5e76\u65f6\u51fa\u73b0\u4e86\u201cFast forward\u201d\u7684\u63d0\u793a\u3002\u7531\u4e8e\u5f53\u524dmaster\u00a0\u5206\u652f\u6307\u9488\u76f4\u63a5\u53f3\u79fb\u3002\u6362\u53e5\u8bdd\u8bf4\uff0c\u5982\u679c\u987a\u7740\u4e00\u4e2a\u5206\u652f\u8d70\u4e0b\u53bb\u53ef\u4ee5\u5230\u8fbe\u53e6\u4e00\u4e2a\u5206\u652f\u7684\u8bdd\uff0c\u90a3\u4e48 Git \u5728\u5408\u5e76\u4e24\u8005\u65f6\uff0c\u53ea\u4f1a\u7b80\u5355\u5730\u628a\u6307\u9488\u53f3\u79fb\uff0c\u56e0\u4e3a\u8fd9\u79cd\u5355\u7ebf\u7684\u5386\u53f2\u5206\u652f\u4e0d\u5b58\u5728\u4efb\u4f55\u9700\u8981\u89e3\u51b3\u7684\u5206\u6b67\uff0c\u6240\u4ee5\u8fd9\u79cd\u5408\u5e76\u8fc7\u7a0b\u53ef\u4ee5\u79f0\u4e3a\u5feb\u8fdb\uff08Fast forward\uff09\u3002<\/pre>\n
      \u73b0\u5728\u6700\u65b0\u7684\u4fee\u6539\u5df2\u7ecf\u5728\u5f53\u524dmaster\u5206\u652f\u6240\u6307\u5411\u7684\u63d0\u4ea4\u5bf9\u8c61\u4e2d\u4e86\uff0c\u53ef\u4ee5\u90e8\u7f72\u5230\u751f\u4ea7\u670d\u52a1\u5668\u4e0a\u53bb\u4e86\uff08\u89c1\u56fe 3-14\uff09\u3002<\/p>\n
      \u56fe 3-14. \u5408\u5e76\u4e4b\u540e\uff0cmaster \u5206\u652f\u548c hotfix \u5206\u652f\u6307\u5411\u540c\u4e00\u4f4d\u7f6e\u3002<\/p>\n
      \u5728\u90a3\u4e2a\u8d85\u7ea7\u91cd\u8981\u7684\u4fee\u8865\u53d1\u5e03\u4ee5\u540e\uff0c\u4f60\u60f3\u8981\u56de\u5230\u88ab\u6253\u6270\u4e4b\u524d\u7684\u5de5\u4f5c\u3002\u7531\u4e8e\u5f53\u524dhotfix\u5206\u652f\u548cmaster\u00a0\u90fd\u6307\u5411\u76f8\u540c\u7684\u63d0\u4ea4\u5bf9\u8c61\uff0c\u6240\u4ee5hotfix\u00a0\u5df2\u7ecf\u5b8c\u6210\u4e86\u5386\u53f2\u4f7f\u547d\uff0c\u53ef\u4ee5\u5220\u6389\u4e86\u3002\u4f7f\u7528git branch\u7684-d\u00a0\u9009\u9879\u6267\u884c\u5220\u9664\u64cd\u4f5c\uff1a<\/p>\n
      $ git branch -d hotfix\r\nDeleted branch hotfix (was 3a0874c).\r\n\u73b0\u5728\u56de\u5230\u4e4b\u524d\u672a\u5b8c\u6210\u7684 #53 \u95ee\u9898\u4fee\u590d\u5206\u652f\u4e0a\u7ee7\u7eed\u5de5\u4f5c\uff08\u56fe 3-15\uff09\uff1a<\/pre>\n
      $ git checkout iss53\r\nSwitched to branch 'iss53'\r\n$ vim index.html\r\n$ git commit -a -m 'finished the new footer [issue 53]'\r\n[iss53 ad82d7a] finished the new footer [issue 53]\r\n 1 file changed, 1 insertion(+)\r\n\u56fe 3-15. iss53 \u5206\u652f\u53ef\u4ee5\u4e0d\u53d7\u5f71\u54cd\u7ee7\u7eed\u63a8\u8fdb\u3002<\/pre>\n
      \u503c\u5f97\u6ce8\u610f\u7684\u662f\u4e4b\u524d\u00a0hotfix\u00a0\u5206\u652f\u7684\u4fee\u6539\u5185\u5bb9\u5c1a\u672a\u5305\u542b\u5230\u00a0iss53\u00a0\u4e2d\u6765\u3002\u5982\u679c\u9700\u8981\u7eb3\u5165\u6b64\u6b21\u4fee\u8865\uff0c\u53ef\u4ee5\u7528\u00a0git merge master\u00a0\u628a master \u5206\u652f\u5408\u5e76\u5230iss53\uff1b\u6216\u8005\u7b49iss53\u00a0\u5b8c\u6210\u4e4b\u540e\uff0c\u518d\u5c06\u00a0iss53\u00a0\u5206\u652f\u4e2d\u7684\u66f4\u65b0\u5e76\u5165master\u3002<\/p>\n
      \u5206\u652f\u7684\u5408\u5e76<\/h2>\n
      \u5728\u95ee\u9898 #53 \u76f8\u5173\u7684\u5de5\u4f5c\u5b8c\u6210\u4e4b\u540e\uff0c\u53ef\u4ee5\u5408\u5e76\u56de\u00a0master\u00a0\u5206\u652f\u3002\u5b9e\u9645\u64cd\u4f5c\u540c\u524d\u9762\u5408\u5e76\u00a0hotfix\u00a0\u5206\u652f\u5dee\u4e0d\u591a\uff0c\u53ea\u9700\u56de\u5230\u00a0master\u5206\u652f\uff0c\u8fd0\u884c\u00a0git merge\u00a0\u547d\u4ee4\u6307\u5b9a\u8981\u5408\u5e76\u8fdb\u6765\u7684\u5206\u652f\uff1a<\/p>\n
      $ git checkout master\r\n$ git merge iss53\r\nAuto-merging README\r\nMerge made by the 'recursive' strategy.\r\n README | 1 +\r\n 1 file changed, 1 insertion(+)\r\n\u8bf7\u6ce8\u610f\uff0c\u8fd9\u6b21\u5408\u5e76\u64cd\u4f5c\u7684\u5e95\u5c42\u5b9e\u73b0\uff0c\u5e76\u4e0d\u540c\u4e8e\u4e4b\u524diss53\u00a0\u5206\u652f\u7684\u76f4\u63a5\u7956\u5148\uff0cGit \u4e0d\u5f97\u4e0d\u8fdb\u884c\u4e00\u4e9b\u989d\u5916\u5904\u7406\u3002\u5c31\u6b64\u4f8b\u800c\u8a00\uff0cGit \u4f1a\u7528\u4e24\u4e2a\u5206\u652f\u7684\u672b\u7aef\uff08C4 \u548c C5\uff09\u4ee5\u53ca\u5b83\u4eec\u7684\u5171\u540c\u7956\u5148\uff08C2\uff09\u8fdb\u884c\u4e00\u6b21\u7b80\u5355\u7684\u4e09\u65b9\u5408\u5e76\u8ba1\u7b97\u3002\u56fe 3-16 \u7528\u7ea2\u6846\u6807\u51fa\u4e86 Git \u7528\u4e8e\u5408\u5e76\u7684\u4e09\u4e2a\u63d0\u4ea4\u5bf9\u8c61\uff1a<\/pre>\n
      \u56fe 3-16. Git \u4e3a\u5206\u652f\u5408\u5e76\u81ea\u52a8\u8bc6\u522b\u51fa\u6700\u4f73\u7684\u540c\u6e90\u5408\u5e76\u70b9\u3002<\/p>\n
      \u8fd9\u6b21\uff0cGit \u6ca1\u6709\u7b80\u5355\u5730\u628a\u5206\u652f\u6307\u9488\u53f3\u79fb\uff0c\u800c\u662f\u5bf9\u4e09\u65b9\u5408\u5e76\u540e\u7684\u7ed3\u679c\u91cd\u65b0\u505a\u4e00\u4e2a\u65b0\u7684\u5feb\u7167\uff0c\u5e76\u81ea\u52a8\u521b\u5efa\u4e00\u4e2a\u6307\u5411\u5b83\u7684\u63d0\u4ea4\u5bf9\u8c61\uff08C6\uff09\uff08\u89c1\u56fe 3-17\uff09\u3002\u8fd9\u4e2a\u63d0\u4ea4\u5bf9\u8c61\u6bd4\u8f83\u7279\u6b8a\uff0c\u5b83\u6709\u4e24\u4e2a\u7956\u5148\uff08C4 \u548c C5\uff09\u3002<\/p>\n
      \u503c\u5f97\u4e00\u63d0\u7684\u662f Git \u53ef\u4ee5\u81ea\u5df1\u88c1\u51b3\u54ea\u4e2a\u5171\u540c\u7956\u5148\u624d\u662f\u6700\u4f73\u5408\u5e76\u57fa\u7840\uff1b\u8fd9\u548c CVS \u6216 Subversion\uff081.5 \u4ee5\u540e\u7684\u7248\u672c\uff09\u4e0d\u540c\uff0c\u5b83\u4eec\u9700\u8981\u5f00\u53d1\u8005\u624b\u5de5\u6307\u5b9a\u5408\u5e76\u57fa\u7840\u3002\u6240\u4ee5\u6b64\u7279\u6027\u8ba9 Git \u7684\u5408\u5e76\u64cd\u4f5c\u6bd4\u5176\u4ed6\u7cfb\u7edf\u90fd\u8981\u7b80\u5355\u4e0d\u5c11\u3002<\/p>\n
      \u56fe 3-17. Git \u81ea\u52a8\u521b\u5efa\u4e86\u4e00\u4e2a\u5305\u542b\u4e86\u5408\u5e76\u7ed3\u679c\u7684\u63d0\u4ea4\u5bf9\u8c61\u3002<\/p>\n
      \u65e2\u7136\u4e4b\u524d\u7684\u5de5\u4f5c\u6210\u679c\u5df2\u7ecf\u5408\u5e76\u5230master\u00a0\u4e86\uff0c\u90a3\u4e48iss53\u00a0\u4e5f\u5c31\u6ca1\u7528\u4e86\u3002\u4f60\u53ef\u4ee5\u5c31\u6b64\u5220\u9664\u5b83\uff0c\u5e76\u5728\u95ee\u9898\u8ffd\u8e2a\u7cfb\u7edf\u91cc\u5173\u95ed\u8be5\u95ee\u9898\u3002<\/p>\n
      $ git branch -d iss53\r\n<\/pre>\n
      \u9047\u5230\u51b2\u7a81\u65f6\u7684\u5206\u652f\u5408\u5e76<\/h2>\n
      \u6709\u65f6\u5019\u5408\u5e76\u64cd\u4f5c\u5e76\u4e0d\u4f1a\u5982\u6b64\u987a\u5229\u3002\u5982\u679c\u5728\u4e0d\u540c\u7684\u5206\u652f\u4e2d\u90fd\u4fee\u6539\u4e86\u540c\u4e00\u4e2a\u6587\u4ef6\u7684\u540c\u4e00\u90e8\u5206\uff0cGit \u5c31\u65e0\u6cd5\u5e72\u51c0\u5730\u628a\u4e24\u8005\u5408\u5230\u4e00\u8d77\uff08\u8bd1\u6ce8\uff1a\u903b\u8f91\u4e0a\u8bf4\uff0c\u8fd9\u79cd\u95ee\u9898\u53ea\u80fd\u7531\u4eba\u6765\u88c1\u51b3\u3002\uff09\u3002\u5982\u679c\u4f60\u5728\u89e3\u51b3\u95ee\u9898 #53 \u7684\u8fc7\u7a0b\u4e2d\u4fee\u6539\u4e86hotfix\u00a0\u4e2d\u4fee\u6539\u7684\u90e8\u5206\uff0c\u5c06\u5f97\u5230\u7c7b\u4f3c\u4e0b\u9762\u7684\u7ed3\u679c\uff1a<\/p>\n
      $ git merge iss53\r\nAuto-merging index.html\r\nCONFLICT (content): Merge conflict in index.html\r\nAutomatic merge failed; fix conflicts and then commit the result.\r\nGit \u4f5c\u4e86\u5408\u5e76\uff0c\u4f46\u6ca1\u6709\u63d0\u4ea4\uff0c\u5b83\u4f1a\u505c\u4e0b\u6765\u7b49\u4f60\u89e3\u51b3\u51b2\u7a81\u3002\u8981\u770b\u770b\u54ea\u4e9b\u6587\u4ef6\u5728\u5408\u5e76\u65f6\u53d1\u751f\u51b2\u7a81\uff0c\u53ef\u4ee5\u7528git status\u67e5\u9605\uff1a<\/pre>\n
      $ git status\r\nOn branch master\r\nYou have unmerged paths.\r\n  (fix conflicts and run \"git commit\")\r\n\r\nUnmerged paths:\r\n  (use \"git add <file>...\" to mark resolution)\r\n\r\n        both modified:      index.html\r\n\r\nno changes added to commit (use \"git add\" and\/or \"git commit -a\")\r\n\u4efb\u4f55\u5305\u542b\u672a\u89e3\u51b3\u51b2\u7a81\u7684\u6587\u4ef6\u90fd\u4f1a\u4ee5\u672a\u5408\u5e76\uff08unmerged\uff09\u7684\u72b6\u6001\u5217\u51fa\u3002Git \u4f1a\u5728\u6709\u51b2\u7a81\u7684\u6587\u4ef6\u91cc\u52a0\u5165\u6807\u51c6\u7684\u51b2\u7a81\u89e3\u51b3\u6807\u8bb0\uff0c\u53ef\u4ee5\u901a\u8fc7\u5b83\u4eec\u6765\u624b\u5de5\u5b9a\u4f4d\u5e76\u89e3\u51b3\u8fd9\u4e9b\u51b2\u7a81\u3002\u53ef\u4ee5\u770b\u5230\u6b64\u6587\u4ef6\u5305\u542b\u7c7b\u4f3c\u4e0b\u9762\u8fd9\u6837\u7684\u90e8\u5206\uff1a<\/pre>\n
      <<<<<<< HEAD\r\n<div id=\"footer\">contact : email.support@github.com<\/div>\r\n=======\r\n<div id=\"footer\">\r\n  please contact us at support@github.com\r\n<\/div>\r\n>>>>>>> iss53\r\n\u53ef\u4ee5\u770b\u5230\u00a0iss53\u00a0\u5206\u652f\u4e2d\u7684\u5185\u5bb9\u3002\u89e3\u51b3\u51b2\u7a81\u7684\u529e\u6cd5\u65e0\u975e\u662f\u4e8c\u8005\u9009\u5176\u4e00\u6216\u8005\u7531\u4f60\u4eb2\u81ea\u6574\u5408\u5230\u4e00\u8d77\u3002\u6bd4\u5982\u4f60\u53ef\u4ee5\u901a\u8fc7\u628a\u8fd9\u6bb5\u5185\u5bb9\u66ff\u6362\u4e3a\u4e0b\u9762\u8fd9\u6837\u6765\u89e3\u51b3\uff1a<\/pre>\n
      <div id=\"footer\">\r\nplease contact us at email.support@github.com\r\n<\/div>\r\n\u8fd9\u4e2a\u89e3\u51b3\u65b9\u6848\u5404\u91c7\u7eb3\u4e86\u4e24\u4e2a\u5206\u652f\u4e2d\u7684\u4e00\u90e8\u5206\u5185\u5bb9\uff0c\u800c\u4e14\u6211\u8fd8\u5220\u9664\u4e86\u00a0git mergetool\uff0c\u5b83\u4f1a\u8c03\u7528\u4e00\u4e2a\u53ef\u89c6\u5316\u7684\u5408\u5e76\u5de5\u5177\u5e76\u5f15\u5bfc\u4f60\u89e3\u51b3\u6240\u6709\u51b2\u7a81\uff1a<\/pre>\n
      $ git mergetool\r\n\r\nThis message is displayed because 'merge.tool' is not configured.\r\nSee 'git mergetool --tool-help' or 'git help config' for more details.\r\n'git mergetool' will now attempt to use one of the following tools:\r\nopendiff kdiff3 tkdiff xxdiff meld tortoisemerge gvimdiff diffuse diffmerge ecmerge p4merge araxis bc3 codecompare vimdiff emerge\r\nMerging:\r\nindex.html\r\n\r\nNormal merge conflict for 'index.html':\r\n  {local}: modified file\r\n  {remote}: modified file\r\nHit return to start merge resolution tool (opendiff):\r\n<\/pre>\n
      \u5982\u679c\u4e0d\u60f3\u7528\u9ed8\u8ba4\u7684\u5408\u5e76\u5de5\u5177\uff08Git \u4e3a\u6211\u9ed8\u8ba4\u9009\u62e9\u4e86opendiff\uff0c\u56e0\u4e3a\u6211\u5728 Mac \u4e0a\u8fd0\u884c\u4e86\u8be5\u547d\u4ee4\uff09\uff0c\u4f60\u53ef\u4ee5\u5728\u4e0a\u65b9”merge tool candidates”\u91cc\u627e\u5230\u53ef\u7528\u7684\u5408\u5e76\u5de5\u5177\u5217\u8868\uff0c\u8f93\u5165\u4f60\u60f3\u7528\u7684\u5de5\u5177\u540d\u3002\u6211\u4eec\u5c06\u5728\u7b2c\u4e03\u7ae0\u8ba8\u8bba\u600e\u6837\u6539\u53d8\u73af\u5883\u4e2d\u7684\u9ed8\u8ba4\u503c\u3002<\/p>\n
      \u9000\u51fa\u5408\u5e76\u5de5\u5177\u4ee5\u540e\uff0cGit \u4f1a\u8be2\u95ee\u4f60\u5408\u5e76\u662f\u5426\u6210\u529f\u3002\u5982\u679c\u56de\u7b54\u662f\uff0c\u5b83\u4f1a\u4e3a\u4f60\u628a\u76f8\u5173\u6587\u4ef6\u6682\u5b58\u8d77\u6765\uff0c\u4ee5\u8868\u660e\u72b6\u6001\u4e3a\u5df2\u89e3\u51b3\u3002<\/p>\n
      \u518d\u8fd0\u884c\u4e00\u6b21\u00a0git status\u00a0\u6765\u786e\u8ba4\u6240\u6709\u51b2\u7a81\u90fd\u5df2\u89e3\u51b3\uff1a<\/p>\n
      $ git status\r\nOn branch master\r\nChanges to be committed:\r\n  (use \"git reset HEAD <file>...\" to unstage)\r\n\r\n        modified:   index.html\r\n<\/pre>\n
      \u5982\u679c\u89c9\u5f97\u6ee1\u610f\u4e86\uff0c\u5e76\u4e14\u786e\u8ba4\u6240\u6709\u51b2\u7a81\u90fd\u5df2\u89e3\u51b3\uff0c\u4e5f\u5c31\u662f\u8fdb\u5165\u4e86\u6682\u5b58\u533a\uff0c\u5c31\u53ef\u4ee5\u7528git commit\u00a0\u6765\u5b8c\u6210\u8fd9\u6b21\u5408\u5e76\u63d0\u4ea4\u3002\u63d0\u4ea4\u7684\u8bb0\u5f55\u5dee\u4e0d\u591a\u662f\u8fd9\u6837\uff1a<\/p>\n
      Merge branch 'iss53'\r\n\r\nConflicts:\r\n  index.html\r\n#\r\n# It looks like you may be committing a merge.\r\n# If this is not correct, please remove the file\r\n#       .git\/MERGE_HEAD\r\n# and try again.\r\n#\r\n<\/pre>\n
      \u5982\u679c\u60f3\u7ed9\u5c06\u6765\u770b\u8fd9\u6b21\u5408\u5e76\u7684\u4eba\u4e00\u4e9b\u65b9\u4fbf\uff0c\u53ef\u4ee5\u4fee\u6539\u8be5\u4fe1\u606f\uff0c\u63d0\u4f9b\u66f4\u591a\u5408\u5e76\u7ec6\u8282\u3002\u6bd4\u5982\u4f60\u90fd\u4f5c\u4e86\u54ea\u4e9b\u6539\u52a8\uff0c\u4ee5\u53ca\u8fd9\u4e48\u505a\u7684\u539f\u56e0\u3002\u6709\u65f6\u5019\u88c1\u51b3\u51b2\u7a81\u7684\u7406\u7531\u5e76\u4e0d\u76f4\u63a5\u6216\u660e\u663e\uff0c\u6709\u5fc5\u8981\u7565\u52a0\u6ce8\u89e3\u3002<\/p>\n<\/div>\n
      <\/div>\n
      <\/div>\n
      \u663e\u793a\u5206\u652f\uff1a<\/div>\n
      # git branch -v
      \n* master b14b067 a<\/div>\n
      # git branch –merged<\/div>\n
      # git branch –no-merged<\/div>\n
      <\/div>\n
      \u5220\u9664\u5206\u652f\uff1a<\/div>\n
      # git branch -d br1<\/div>\n
      <\/div>\n
      \u4ee5\u4e0a\u6240\u8bf4\u7684\u5206\u652f\u90fd\u662f\u5728\u672c\u5730\u7684\u5206\u652f\uff0c\u4e0b\u9762\u624d\u662f\u8fdc\u7a0b\u5206\u652f\u7684\u5904\u7406\u3002<\/div>\n
      <\/div>\n
      \n
      \u8fdc\u7a0b\u5206\u652f<\/h1>\n
      \u8fdc\u7a0b\u5206\u652f\uff08remote branch\uff09\u662f\u5bf9\u8fdc\u7a0b\u4ed3\u5e93\u4e2d\u7684\u5206\u652f\u7684\u7d22\u5f15\u3002\u5b83\u4eec\u662f\u4e00\u4e9b\u65e0\u6cd5\u79fb\u52a8\u7684\u672c\u5730\u5206\u652f\uff1b\u53ea\u6709\u5728 Git \u8fdb\u884c\u7f51\u7edc\u4ea4\u4e92\u65f6\u624d\u4f1a\u66f4\u65b0\u3002\u8fdc\u7a0b\u5206\u652f\u5c31\u50cf\u662f\u4e66\u7b7e\uff0c\u63d0\u9192\u7740\u4f60\u4e0a\u6b21\u8fde\u63a5\u8fdc\u7a0b\u4ed3\u5e93\u65f6\u4e0a\u9762\u5404\u5206\u652f\u7684\u4f4d\u7f6e\u3002<\/p>\n
      \u6211\u4eec\u7528\u00a0(\u8fdc\u7a0b\u4ed3\u5e93\u540d)\/(\u5206\u652f\u540d)\u00a0\u8fd9\u6837\u7684\u5f62\u5f0f\u8868\u793a\u8fdc\u7a0b\u5206\u652f\u3002\u6bd4\u5982\u6211\u4eec\u60f3\u770b\u770b\u4e0a\u6b21\u540c\u00a0origin\u00a0\u4ed3\u5e93\u901a\u8baf\u65f6\u00a0master\u5206\u652f\u7684\u6837\u5b50\uff0c\u5c31\u5e94\u8be5\u67e5\u770b\u00a0origin\/master\u00a0\u5206\u652f\u3002\u5982\u679c\u4f60\u548c\u540c\u4f34\u4e00\u8d77\u4fee\u590d\u67d0\u4e2a\u95ee\u9898\uff0c\u4f46\u4ed6\u4eec\u5148\u63a8\u9001\u4e86\u4e00\u4e2aiss53\u00a0\u5206\u652f\u5230\u8fdc\u7a0b\u4ed3\u5e93\uff0c\u867d\u7136\u4f60\u53ef\u80fd\u4e5f\u6709\u4e00\u4e2a\u672c\u5730\u7684iss53\u00a0\u5206\u652f\uff0c\u4f46\u6307\u5411\u670d\u52a1\u5668\u4e0a\u6700\u65b0\u66f4\u65b0\u7684\u5374\u5e94\u8be5\u662forigin\/iss53\u00a0\u5206\u652f\u3002<\/p>\n
      \u53ef\u80fd\u6709\u70b9\u4e71\uff0c\u6211\u4eec\u4e0d\u59a8\u4e3e\u4f8b\u8bf4\u660e\u3002\u5047\u8bbe\u4f60\u4eec\u56e2\u961f\u6709\u4e2a\u5730\u5740\u4e3a\u00a0git.ourcompany.com\u00a0\u7684 Git \u670d\u52a1\u5668\u3002\u5982\u679c\u4f60\u4ece\u8fd9\u91cc\u514b\u9686\uff0cGit \u4f1a\u81ea\u52a8\u4e3a\u4f60\u5c06\u6b64\u8fdc\u7a0b\u4ed3\u5e93\u547d\u540d\u4e3a\u00a0origin\uff0c\u5e76\u4e0b\u8f7d\u5176\u4e2d\u6240\u6709\u7684\u6570\u636e\uff0c\u5efa\u7acb\u4e00\u4e2a\u6307\u5411\u5b83\u7684\u00a0master\u5206\u652f\u7684\u6307\u9488\uff0c\u5728\u672c\u5730\u547d\u540d\u4e3a\u00a0origin\/master\uff0c\u4f46\u4f60\u65e0\u6cd5\u5728\u672c\u5730\u66f4\u6539\u5176\u6570\u636e\u3002\u63a5\u7740\uff0cGit \u5efa\u7acb\u4e00\u4e2a\u5c5e\u4e8e\u4f60\u81ea\u5df1\u7684\u672c\u5730\u00a0master\u00a0\u5206\u652f\uff0c\u59cb\u4e8e\u00a0origin\u00a0\u4e0amaster\u00a0\u5206\u652f\u76f8\u540c\u7684\u4f4d\u7f6e\uff0c\u4f60\u53ef\u4ee5\u5c31\u6b64\u5f00\u59cb\u5de5\u4f5c\uff08\u89c1\u56fe 3-22\uff09\uff1a<\/p>\n
      \u56fe 3-22. \u4e00\u6b21 Git \u514b\u9686\u4f1a\u5efa\u7acb\u4f60\u81ea\u5df1\u7684\u672c\u5730\u5206\u652f master \u548c\u8fdc\u7a0b\u5206\u652f origin\/master\uff0c\u5e76\u4e14\u5c06\u5b83\u4eec\u90fd\u6307\u5411origin\u00a0\u4e0a\u7684\u00a0master\u00a0\u5206\u652f\u3002<\/p>\n
      \u5982\u679c\u4f60\u5728\u672c\u5730\u00a0master\u00a0\u5206\u652f\u505a\u4e86\u4e9b\u6539\u52a8\uff0c\u4e0e\u6b64\u540c\u65f6\uff0c\u5176\u4ed6\u4eba\u5411\u00a0git.ourcompany.com\u00a0\u63a8\u9001\u4e86\u4ed6\u4eec\u7684\u66f4\u65b0\uff0c\u90a3\u4e48\u670d\u52a1\u5668\u4e0a\u7684\u00a0master\u00a0\u5206\u652f\u5c31\u4f1a\u5411\u524d\u63a8\u8fdb\uff0c\u800c\u4e8e\u6b64\u540c\u65f6\uff0c\u4f60\u5728\u672c\u5730\u7684\u63d0\u4ea4\u5386\u53f2\u6b63\u671d\u5411\u4e0d\u540c\u65b9\u5411\u53d1\u5c55\u3002\u4e0d\u8fc7\u53ea\u8981\u4f60\u4e0d\u548c\u670d\u52a1\u5668\u901a\u8baf\uff0c\u4f60\u7684\u00a0origin\/master\u00a0\u6307\u9488\u4ecd\u7136\u4fdd\u6301\u539f\u4f4d\u4e0d\u4f1a\u79fb\u52a8\uff08\u89c1\u56fe 3-23\uff09\u3002<\/p>\n
      \u56fe 3-23. \u5728\u672c\u5730\u5de5\u4f5c\u7684\u540c\u65f6\u6709\u4eba\u5411\u8fdc\u7a0b\u4ed3\u5e93\u63a8\u9001\u5185\u5bb9\u4f1a\u8ba9\u63d0\u4ea4\u5386\u53f2\u5f00\u59cb\u5206\u6d41\u3002<\/p>\n
      \u53ef\u4ee5\u8fd0\u884c\u00a0git fetch origin\u00a0\u6765\u540c\u6b65\u8fdc\u7a0b\u670d\u52a1\u5668\u4e0a\u7684\u6570\u636e\u5230\u672c\u5730\u3002\u8be5\u547d\u4ee4\u9996\u5148\u627e\u5230\u00a0origin\u00a0\u662f\u54ea\u4e2a\u670d\u52a1\u5668\uff08\u672c\u4f8b\u4e3a\u00a0git.ourcompany.com\uff09\uff0c\u4ece\u4e0a\u9762\u83b7\u53d6\u4f60\u5c1a\u672a\u62e5\u6709\u7684\u6570\u636e\uff0c\u66f4\u65b0\u4f60\u672c\u5730\u7684\u6570\u636e\u5e93\uff0c\u7136\u540e\u628a\u00a0origin\/master\u7684\u6307\u9488\u79fb\u5230\u5b83\u6700\u65b0\u7684\u4f4d\u7f6e\u4e0a\uff08\u89c1\u56fe 3-24\uff09\u3002<\/p>\n
      \u56fe 3-24. git fetch \u547d\u4ee4\u4f1a\u66f4\u65b0 remote \u7d22\u5f15\u3002<\/p>\n
      \u4e3a\u4e86\u6f14\u793a\u62e5\u6709\u591a\u4e2a\u8fdc\u7a0b\u5206\u652f\uff08\u5728\u4e0d\u540c\u7684\u8fdc\u7a0b\u670d\u52a1\u5668\u4e0a\uff09\u7684\u9879\u76ee\u662f\u5982\u4f55\u5de5\u4f5c\u7684\uff0c\u6211\u4eec\u5047\u8bbe\u4f60\u8fd8\u6709\u53e6\u4e00\u4e2a\u4ec5\u4f9b\u4f60\u7684\u654f\u6377\u5f00\u53d1\u5c0f\u7ec4\u4f7f\u7528\u7684\u5185\u90e8\u670d\u52a1\u5668\u00a0git.team1.ourcompany.com\u3002\u53ef\u4ee5\u7528\u7b2c\u4e8c\u7ae0\u4e2d\u63d0\u5230\u7684\u00a0git remote add\u00a0\u547d\u4ee4\u628a\u5b83\u52a0\u4e3a\u5f53\u524d\u9879\u76ee\u7684\u8fdc\u7a0b\u5206\u652f\u4e4b\u4e00\u3002\u6211\u4eec\u628a\u5b83\u547d\u540d\u4e3ateamone\uff0c\u4ee5\u4fbf\u4ee3\u66ff\u5b8c\u6574\u7684 Git URL \u4ee5\u65b9\u4fbf\u4f7f\u7528\uff08\u89c1\u56fe 3-25\uff09\u3002<\/p>\n
      \u56fe 3-25. \u628a\u53e6\u4e00\u4e2a\u670d\u52a1\u5668\u52a0\u4e3a\u8fdc\u7a0b\u4ed3\u5e93<\/p>\n
      \u73b0\u5728\u4f60\u53ef\u4ee5\u7528\u00a0git fetch teamone\u00a0\u6765\u83b7\u53d6\u5c0f\u7ec4\u670d\u52a1\u5668\u4e0a\u4f60\u8fd8\u6ca1\u6709\u7684\u6570\u636e\u4e86\u3002\u7531\u4e8e\u5f53\u524d\u8be5\u670d\u52a1\u5668\u4e0a\u7684\u5185\u5bb9\u662f\u4f60origin\u00a0\u670d\u52a1\u5668\u4e0a\u7684\u5b50\u96c6\uff0cGit \u4e0d\u4f1a\u4e0b\u8f7d\u4efb\u4f55\u6570\u636e\uff0c\u800c\u53ea\u662f\u7b80\u5355\u5730\u521b\u5efa\u4e00\u4e2a\u540d\u4e3a\u00a0teamone\/master\u00a0\u7684\u8fdc\u7a0b\u5206\u652f\uff0c\u6307\u5411\u00a0teamone\u00a0\u670d\u52a1\u5668\u4e0a\u00a0master\u00a0\u5206\u652f\u6240\u5728\u7684\u63d0\u4ea4\u5bf9\u8c61\u00a031b8e\uff08\u89c1\u56fe 3-26\uff09\u3002<\/p>\n
      \u56fe 3-26. \u4f60\u5728\u672c\u5730\u6709\u4e86\u4e00\u4e2a\u6307\u5411 teamone \u670d\u52a1\u5668\u4e0a master \u5206\u652f\u7684\u7d22\u5f15\u3002<\/p>\n
      \u63a8\u9001\u672c\u5730\u5206\u652f<\/h2>\n
      \u8981\u60f3\u548c\u5176\u4ed6\u4eba\u5206\u4eab\u67d0\u4e2a\u672c\u5730\u5206\u652f\uff0c\u4f60\u9700\u8981\u628a\u5b83\u63a8\u9001\u5230\u4e00\u4e2a\u4f60\u62e5\u6709\u5199\u6743\u9650\u7684\u8fdc\u7a0b\u4ed3\u5e93\u3002\u4f60\u521b\u5efa\u7684\u672c\u5730\u5206\u652f\u4e0d\u4f1a\u56e0\u4e3a\u4f60\u7684\u5199\u5165\u64cd\u4f5c\u800c\u88ab\u81ea\u52a8\u540c\u6b65\u5230\u4f60\u5f15\u5165\u7684\u8fdc\u7a0b\u670d\u52a1\u5668\u4e0a\uff0c\u4f60\u9700\u8981\u660e\u786e\u5730\u6267\u884c\u63a8\u9001\u5206\u652f\u7684\u64cd\u4f5c\u3002\u6362\u53e5\u8bdd\u8bf4\uff0c\u5bf9\u4e8e\u65e0\u610f\u5206\u4eab\u7684\u5206\u652f\uff0c\u4f60\u5c3d\u7ba1\u4fdd\u7559\u4e3a\u79c1\u4eba\u5206\u652f\u597d\u4e86\uff0c\u800c\u53ea\u63a8\u9001\u90a3\u4e9b\u534f\u540c\u5de5\u4f5c\u8981\u7528\u5230\u7684\u7279\u6027\u5206\u652f\u3002<\/p>\n
      \u5982\u679c\u4f60\u6709\u4e2a\u53eb\u00a0serverfix\u00a0\u7684\u5206\u652f\u9700\u8981\u548c\u4ed6\u4eba\u4e00\u8d77\u5f00\u53d1\uff0c\u53ef\u4ee5\u8fd0\u884c\u00a0git push (\u8fdc\u7a0b\u4ed3\u5e93\u540d) (\u5206\u652f\u540d)\uff1a<\/p>\n
      $ git push origin serverfix\r\nCounting objects: 20, done.\r\nCompressing objects: 100% (14\/14), done.\r\nWriting objects: 100% (15\/15), 1.74 KiB, done.\r\nTotal 15 (delta 5), reused 0 (delta 0)\r\nTo git@github.com:schacon\/simplegit.git\r\n * [new branch]      serverfix -> serverfix\r\n<\/pre>\n
      \u8fd9\u91cc\u5176\u5b9e\u8d70\u4e86\u4e00\u70b9\u6377\u5f84\u3002Git \u81ea\u52a8\u628a\u00a0serverfix\u00a0\u5206\u652f\u540d\u6269\u5c55\u4e3a\u00a0refs\/heads\/serverfix:refs\/heads\/serverfix\uff0c\u610f\u4e3a\u201c\u53d6\u51fa\u6211\u5728\u672c\u5730\u7684 serverfix \u5206\u652f\uff0c\u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93\u7684 serverfix \u5206\u652f\u4e2d\u53bb\u201d\u3002\u6211\u4eec\u5c06\u5728\u7b2c\u4e5d\u7ae0\u8fdb\u4e00\u6b65\u4ecb\u7ecdrefs\/heads\/\u00a0\u90e8\u5206\u7684\u7ec6\u8282\uff0c\u4e0d\u8fc7\u4e00\u822c\u4f7f\u7528\u7684\u65f6\u5019\u90fd\u53ef\u4ee5\u7701\u7565\u5b83\u3002\u4e5f\u53ef\u4ee5\u8fd0\u884c\u00a0git push origin serverfix:serverfix\u00a0\u6765\u5b9e\u73b0\u76f8\u540c\u7684\u6548\u679c\uff0c\u5b83\u7684\u610f\u601d\u662f\u201c\u4e0a\u4f20\u6211\u672c\u5730\u7684 serverfix \u5206\u652f\u5230\u8fdc\u7a0b\u4ed3\u5e93\u4e2d\u53bb\uff0c\u4ecd\u65e7\u79f0\u5b83\u4e3a serverfix \u5206\u652f\u201d\u3002\u901a\u8fc7\u6b64\u8bed\u6cd5\uff0c\u4f60\u53ef\u4ee5\u628a\u672c\u5730\u5206\u652f\u63a8\u9001\u5230\u67d0\u4e2a\u547d\u540d\u4e0d\u540c\u7684\u8fdc\u7a0b\u5206\u652f\uff1a\u82e5\u60f3\u628a\u8fdc\u7a0b\u5206\u652f\u53eb\u4f5cawesomebranch\uff0c\u53ef\u4ee5\u7528\u00a0git push origin serverfix:awesomebranch\u00a0\u6765\u63a8\u9001\u6570\u636e\u3002<\/p>\n
      \u63a5\u4e0b\u6765\uff0c\u5f53\u4f60\u7684\u534f\u4f5c\u8005\u518d\u6b21\u4ece\u670d\u52a1\u5668\u4e0a\u83b7\u53d6\u6570\u636e\u65f6\uff0c\u4ed6\u4eec\u5c06\u5f97\u5230\u4e00\u4e2a\u65b0\u7684\u8fdc\u7a0b\u5206\u652f\u00a0origin\/serverfix\uff0c\u5e76\u6307\u5411\u670d\u52a1\u5668\u4e0a\u00a0serverfix\u00a0\u6240\u6307\u5411\u7684\u7248\u672c\uff1a<\/p>\n
      $ git fetch origin\r\nremote: Counting objects: 20, done.\r\nremote: Compressing objects: 100% (14\/14), done.\r\nremote: Total 15 (delta 5), reused 0 (delta 0)\r\nUnpacking objects: 100% (15\/15), done.\r\nFrom git@github.com:schacon\/simplegit\r\n * [new branch]      serverfix    -> origin\/serverfix\r\n<\/pre>\n
      \u503c\u5f97\u6ce8\u610f\u7684\u662f\uff0c\u5728\u00a0fetch\u00a0\u64cd\u4f5c\u4e0b\u8f7d\u597d\u65b0\u7684\u8fdc\u7a0b\u5206\u652f\u4e4b\u540e\uff0c\u4f60\u4ecd\u7136\u65e0\u6cd5\u5728\u672c\u5730\u7f16\u8f91\u8be5\u8fdc\u7a0b\u4ed3\u5e93\u4e2d\u7684\u5206\u652f\u3002\u6362\u53e5\u8bdd\u8bf4\uff0c\u5728\u672c\u4f8b\u4e2d\uff0c\u4f60\u4e0d\u4f1a\u6709\u4e00\u4e2a\u65b0\u7684\u00a0serverfix\u00a0\u5206\u652f\uff0c\u6709\u7684\u53ea\u662f\u4e00\u4e2a\u4f60\u65e0\u6cd5\u79fb\u52a8\u7684\u00a0origin\/serverfix\u00a0\u6307\u9488\u3002<\/p>\n
      \u5982\u679c\u8981\u628a\u8be5\u8fdc\u7a0b\u5206\u652f\u7684\u5185\u5bb9\u5408\u5e76\u5230\u5f53\u524d\u5206\u652f\uff0c\u53ef\u4ee5\u8fd0\u884c\u00a0git merge origin\/serverfix\u3002\u5982\u679c\u60f3\u8981\u4e00\u4efd\u81ea\u5df1\u7684serverfix\u00a0\u6765\u5f00\u53d1\uff0c\u53ef\u4ee5\u5728\u8fdc\u7a0b\u5206\u652f\u7684\u57fa\u7840\u4e0a\u5206\u5316\u51fa\u4e00\u4e2a\u65b0\u7684\u5206\u652f\u6765\uff1a<\/p>\n
      $ git checkout -b serverfix origin\/serverfix\r\nBranch serverfix set up to track remote branch serverfix from origin.\r\nSwitched to a new branch 'serverfix'\r\n<\/pre>\n
      \u8fd9\u4f1a\u5207\u6362\u5230\u65b0\u5efa\u7684\u00a0serverfix\u00a0\u672c\u5730\u5206\u652f\uff0c\u5176\u5185\u5bb9\u540c\u8fdc\u7a0b\u5206\u652f\u00a0origin\/serverfix\u00a0\u4e00\u81f4\uff0c\u8fd9\u6837\u4f60\u5c31\u53ef\u4ee5\u5728\u91cc\u9762\u7ee7\u7eed\u5f00\u53d1\u4e86\u3002<\/p>\n
      \u8ddf\u8e2a\u8fdc\u7a0b\u5206\u652f<\/h2>\n
      \u4ece\u8fdc\u7a0b\u5206\u652f\u00a0checkout\u00a0\u51fa\u6765\u7684\u672c\u5730\u5206\u652f\uff0c\u79f0\u4e3a\u00a0\u8ddf\u8e2a\u5206\u652f<\/em>\u00a0(tracking branch)\u3002\u8ddf\u8e2a\u5206\u652f\u662f\u4e00\u79cd\u548c\u67d0\u4e2a\u8fdc\u7a0b\u5206\u652f\u6709\u76f4\u63a5\u8054\u7cfb\u7684\u672c\u5730\u5206\u652f\u3002\u5728\u8ddf\u8e2a\u5206\u652f\u91cc\u8f93\u5165\u00a0git push\uff0cGit \u4f1a\u81ea\u884c\u63a8\u65ad\u5e94\u8be5\u5411\u54ea\u4e2a\u670d\u52a1\u5668\u7684\u54ea\u4e2a\u5206\u652f\u63a8\u9001\u6570\u636e\u3002\u540c\u6837\uff0c\u5728\u8fd9\u4e9b\u5206\u652f\u91cc\u8fd0\u884c\u00a0git pull\u00a0\u4f1a\u83b7\u53d6\u6240\u6709\u8fdc\u7a0b\u7d22\u5f15\uff0c\u5e76\u628a\u5b83\u4eec\u7684\u6570\u636e\u90fd\u5408\u5e76\u5230\u672c\u5730\u5206\u652f\u4e2d\u6765\u3002<\/p>\n
      \u5728\u514b\u9686\u4ed3\u5e93\u65f6\uff0cGit \u901a\u5e38\u4f1a\u81ea\u52a8\u521b\u5efa\u4e00\u4e2a\u540d\u4e3a\u00a0master\u00a0\u7684\u5206\u652f\u6765\u8ddf\u8e2a\u00a0origin\/master\u3002\u8fd9\u6b63\u662f\u00a0git push\u00a0\u548cgit pull\u00a0\u4e00\u5f00\u59cb\u5c31\u80fd\u6b63\u5e38\u5de5\u4f5c\u7684\u539f\u56e0\u3002\u5f53\u7136\uff0c\u4f60\u53ef\u4ee5\u968f\u5fc3\u6240\u6b32\u5730\u8bbe\u5b9a\u4e3a\u5176\u5b83\u8ddf\u8e2a\u5206\u652f\uff0c\u6bd4\u5982\u00a0origin\u00a0\u4e0a\u9664\u4e86master\u00a0\u4e4b\u5916\u7684\u5176\u5b83\u5206\u652f\u3002\u521a\u624d\u6211\u4eec\u5df2\u7ecf\u770b\u5230\u4e86\u8fd9\u6837\u7684\u4e00\u4e2a\u4f8b\u5b50\uff1agit checkout -b [\u5206\u652f\u540d] [\u8fdc\u7a0b\u540d]\/[\u5206\u652f\u540d]\u3002\u5982\u679c\u4f60\u6709 1.6.2 \u4ee5\u4e0a\u7248\u672c\u7684 Git\uff0c\u8fd8\u53ef\u4ee5\u7528\u00a0–track\u00a0\u9009\u9879\u7b80\u5316\uff1a<\/p>\n
      $ git checkout --track origin\/serverfix\r\nBranch serverfix set up to track remote branch serverfix from origin.\r\nSwitched to a new branch 'serverfix'\r\n<\/pre>\n
      \u8981\u4e3a\u672c\u5730\u5206\u652f\u8bbe\u5b9a\u4e0d\u540c\u4e8e\u8fdc\u7a0b\u5206\u652f\u7684\u540d\u5b57\uff0c\u53ea\u9700\u5728\u7b2c\u4e00\u4e2a\u7248\u672c\u7684\u547d\u4ee4\u91cc\u6362\u4e2a\u540d\u5b57\uff1a<\/p>\n
      $ git checkout -b sf origin\/serverfix\r\nBranch sf set up to track remote branch serverfix from origin.\r\nSwitched to a new branch 'sf'\r\n<\/pre>\n
      \u73b0\u5728\u4f60\u7684\u672c\u5730\u5206\u652f\u00a0sf\u00a0\u4f1a\u81ea\u52a8\u5c06\u63a8\u9001\u548c\u6293\u53d6\u6570\u636e\u7684\u4f4d\u7f6e\u5b9a\u4f4d\u5230\u00a0origin\/serverfix\u00a0\u4e86\u3002<\/p>\n
      \u5220\u9664\u8fdc\u7a0b\u5206\u652f<\/h2>\n
      \u5982\u679c\u4e0d\u518d\u9700\u8981\u67d0\u4e2a\u8fdc\u7a0b\u5206\u652f\u4e86\uff0c\u6bd4\u5982\u641e\u5b9a\u4e86\u67d0\u4e2a\u7279\u6027\u5e76\u628a\u5b83\u5408\u5e76\u8fdb\u4e86\u8fdc\u7a0b\u7684\u00a0master\u00a0\u5206\u652f\uff08\u6216\u4efb\u4f55\u5176\u4ed6\u5b58\u653e\u7a33\u5b9a\u4ee3\u7801\u7684\u5206\u652f\uff09\uff0c\u53ef\u4ee5\u7528\u8fd9\u4e2a\u975e\u5e38\u65e0\u5398\u5934\u7684\u8bed\u6cd5\u6765\u5220\u9664\u5b83\uff1agit push [\u8fdc\u7a0b\u540d] :[\u5206\u652f\u540d]\u3002\u5982\u679c\u60f3\u5728\u670d\u52a1\u5668\u4e0a\u5220\u9664\u00a0serverfix\u00a0\u5206\u652f\uff0c\u8fd0\u884c\u4e0b\u9762\u7684\u547d\u4ee4\uff1a<\/p>\n
      $ git push origin :serverfix\r\nTo git@github.com:schacon\/simplegit.git\r\n - [deleted]         serverfix\r\n<\/pre>\n
      \u549a\uff01\u670d\u52a1\u5668\u4e0a\u7684\u5206\u652f\u6ca1\u4e86\u3002\u4f60\u6700\u597d\u7279\u522b\u7559\u5fc3\u8fd9\u4e00\u9875\uff0c\u56e0\u4e3a\u4f60\u4e00\u5b9a\u4f1a\u7528\u5230\u90a3\u4e2a\u547d\u4ee4\uff0c\u800c\u4e14\u4f60\u5f88\u53ef\u80fd\u4f1a\u5fd8\u6389\u5b83\u7684\u8bed\u6cd5\u3002\u6709\u79cd\u65b9\u4fbf\u8bb0\u5fc6\u8fd9\u6761\u547d\u4ee4\u7684\u65b9\u6cd5\uff1a\u8bb0\u4f4f\u6211\u4eec\u4e0d\u4e45\u524d\u89c1\u8fc7\u7684\u00a0git push [\u8fdc\u7a0b\u540d] [\u672c\u5730\u5206\u652f]:[\u8fdc\u7a0b\u5206\u652f]\u00a0\u8bed\u6cd5\uff0c\u5982\u679c\u7701\u7565\u00a0[\u672c\u5730\u5206\u652f]\uff0c\u90a3\u5c31\u7b49\u4e8e\u662f\u5728\u8bf4\u201c\u5728\u8fd9\u91cc\u63d0\u53d6\u7a7a\u767d\u7136\u540e\u628a\u5b83\u53d8\u6210[\u8fdc\u7a0b\u5206\u652f]\u201d\u3002<\/p>\n<\/div>\n
      <\/div>\n
      <\/div>\n
      \n
      \u5206\u652f\u7684\u884d\u5408<\/h1>\n
      \u628a\u4e00\u4e2a\u5206\u652f\u4e2d\u7684\u4fee\u6539\u6574\u5408\u5230\u53e6\u4e00\u4e2a\u5206\u652f\u7684\u529e\u6cd5\u6709\u4e24\u79cd\uff1amerge\u00a0\u548c\u00a0rebase\uff08\u8bd1\u6ce8\uff1arebase\u00a0\u7684\u7ffb\u8bd1\u6682\u5b9a\u4e3a\u201c\u884d\u5408\u201d\uff0c\u5927\u5bb6\u77e5\u9053\u5c31\u53ef\u4ee5\u4e86\u3002\uff09\u3002\u5728\u672c\u7ae0\u6211\u4eec\u4f1a\u5b66\u4e60\u4ec0\u4e48\u662f\u884d\u5408\uff0c\u5982\u4f55\u4f7f\u7528\u884d\u5408\uff0c\u4e3a\u4ec0\u4e48\u884d\u5408\u64cd\u4f5c\u5982\u6b64\u5bcc\u6709\u9b45\u529b\uff0c\u4ee5\u53ca\u6211\u4eec\u5e94\u8be5\u5728\u4ec0\u4e48\u60c5\u51b5\u4e0b\u4f7f\u7528\u884d\u5408\u3002<\/p>\n
      \u57fa\u672c\u7684\u884d\u5408\u64cd\u4f5c<\/h2>\n
      \u8bf7\u56de\u987e\u4e4b\u524d\u6709\u5173\u5408\u5e76\u7684\u4e00\u8282\uff08\u89c1\u56fe 3-27\uff09\uff0c\u4f60\u4f1a\u770b\u5230\u5f00\u53d1\u8fdb\u7a0b\u5206\u53c9\u5230\u4e24\u4e2a\u4e0d\u540c\u5206\u652f\uff0c\u53c8\u5404\u81ea\u63d0\u4ea4\u4e86\u66f4\u65b0\u3002<\/p>\n
      \u56fe 3-27. \u6700\u521d\u5206\u53c9\u7684\u63d0\u4ea4\u5386\u53f2\u3002<\/p>\n
      \u4e4b\u524d\u4ecb\u7ecd\u8fc7\uff0c\u6700\u5bb9\u6613\u7684\u6574\u5408\u5206\u652f\u7684\u65b9\u6cd5\u662f\u00a0merge\u00a0\u547d\u4ee4\uff0c\u5b83\u4f1a\u628a\u4e24\u4e2a\u5206\u652f\u6700\u65b0\u7684\u5feb\u7167\uff08C3 \u548c C4\uff09\u4ee5\u53ca\u4e8c\u8005\u6700\u65b0\u7684\u5171\u540c\u7956\u5148\uff08C2\uff09\u8fdb\u884c\u4e09\u65b9\u5408\u5e76\uff0c\u5408\u5e76\u7684\u7ed3\u679c\u662f\u4ea7\u751f\u4e00\u4e2a\u65b0\u7684\u63d0\u4ea4\u5bf9\u8c61\uff08C5\uff09\u3002\u5982\u56fe 3-28 \u6240\u793a\uff1a<\/p>\n
      \u56fe 3-28. \u901a\u8fc7\u5408\u5e76\u4e00\u4e2a\u5206\u652f\u6765\u6574\u5408\u5206\u53c9\u4e86\u7684\u5386\u53f2\u3002<\/p>\n
      \u5176\u5b9e\uff0c\u8fd8\u6709\u53e6\u5916\u4e00\u4e2a\u9009\u62e9\uff1a\u4f60\u53ef\u4ee5\u628a\u5728 C3 \u91cc\u4ea7\u751f\u7684\u53d8\u5316\u8865\u4e01\u5728 C4 \u7684\u57fa\u7840\u4e0a\u91cd\u65b0\u6253\u4e00\u904d\u3002\u5728 Git \u91cc\uff0c\u8fd9\u79cd\u64cd\u4f5c\u53eb\u505a\u884d\u5408\uff08rebase\uff09<\/em>\u3002\u6709\u4e86\u00a0rebase\u00a0\u547d\u4ee4\uff0c\u5c31\u53ef\u4ee5\u628a\u5728\u4e00\u4e2a\u5206\u652f\u91cc\u63d0\u4ea4\u7684\u6539\u53d8\u79fb\u5230\u53e6\u4e00\u4e2a\u5206\u652f\u91cc\u91cd\u653e\u4e00\u904d\u3002<\/p>\n
      \u5728\u4e0a\u9762\u8fd9\u4e2a\u4f8b\u5b50\u4e2d\uff0c\u8fd0\u884c\uff1a<\/p>\n
      $ git checkout experiment\r\n$ git rebase master\r\nFirst, rewinding head to replay your work on top of it...\r\nApplying: added staged command\r\n<\/pre>\n
      \u5b83\u7684\u539f\u7406\u662f\u56de\u5230\u4e24\u4e2a\u5206\u652f\u6700\u8fd1\u7684\u5171\u540c\u7956\u5148\uff0c\u6839\u636e\u5f53\u524d\u5206\u652f\uff08\u4e5f\u5c31\u662f\u8981\u8fdb\u884c\u884d\u5408\u7684\u5206\u652f\u00a0experiment\uff09\u540e\u7eed\u7684\u5386\u6b21\u63d0\u4ea4\u5bf9\u8c61\uff08\u8fd9\u91cc\u53ea\u6709\u4e00\u4e2a C3\uff09\uff0c\u751f\u6210\u4e00\u7cfb\u5217\u6587\u4ef6\u8865\u4e01\uff0c\u7136\u540e\u4ee5\u57fa\u5e95\u5206\u652f\uff08\u4e5f\u5c31\u662f\u4e3b\u5e72\u5206\u652f\u00a0master\uff09\u6700\u540e\u4e00\u4e2a\u63d0\u4ea4\u5bf9\u8c61\uff08C4\uff09\u4e3a\u65b0\u7684\u51fa\u53d1\u70b9\uff0c\u9010\u4e2a\u5e94\u7528\u4e4b\u524d\u51c6\u5907\u597d\u7684\u8865\u4e01\u6587\u4ef6\uff0c\u6700\u540e\u4f1a\u751f\u6210\u4e00\u4e2a\u65b0\u7684\u5408\u5e76\u63d0\u4ea4\u5bf9\u8c61\uff08C3’\uff09\uff0c\u4ece\u800c\u6539\u5199\u00a0experiment\u00a0\u7684\u63d0\u4ea4\u5386\u53f2\uff0c\u4f7f\u5b83\u6210\u4e3a\u00a0master\u00a0\u5206\u652f\u7684\u76f4\u63a5\u4e0b\u6e38\uff0c\u5982\u56fe 3-29 \u6240\u793a\uff1a<\/p>\n
      \u56fe 3-29. \u628a C3 \u91cc\u4ea7\u751f\u7684\u6539\u53d8\u5230 C4 \u4e0a\u91cd\u6f14\u4e00\u904d\u3002<\/p>\n
      \u73b0\u5728\u56de\u5230\u00a0master\u00a0\u5206\u652f\uff0c\u8fdb\u884c\u4e00\u6b21\u5feb\u8fdb\u5408\u5e76\uff08\u89c1\u56fe 3-30\uff09\uff1a<\/p>\n
      \u56fe 3-30. master \u5206\u652f\u7684\u5feb\u8fdb\u3002<\/p>\n
      \u73b0\u5728\u7684 C3′ \u5bf9\u5e94\u7684\u5feb\u7167\uff0c\u5176\u5b9e\u548c\u666e\u901a\u7684\u4e09\u65b9\u5408\u5e76\uff0c\u5373\u4e0a\u4e2a\u4f8b\u5b50\u4e2d\u7684 C5 \u5bf9\u5e94\u7684\u5feb\u7167\u5185\u5bb9\u4e00\u6a21\u4e00\u6837\u4e86\u3002\u867d\u7136\u6700\u540e\u6574\u5408\u5f97\u5230\u7684\u7ed3\u679c\u6ca1\u6709\u4efb\u4f55\u533a\u522b\uff0c\u4f46\u884d\u5408\u80fd\u4ea7\u751f\u4e00\u4e2a\u66f4\u4e3a\u6574\u6d01\u7684\u63d0\u4ea4\u5386\u53f2\u3002\u5982\u679c\u89c6\u5bdf\u4e00\u4e2a\u884d\u5408\u8fc7\u7684\u5206\u652f\u7684\u5386\u53f2\u8bb0\u5f55\uff0c\u770b\u8d77\u6765\u4f1a\u66f4\u6e05\u695a\uff1a\u4eff\u4f5b\u6240\u6709\u4fee\u6539\u90fd\u662f\u5728\u4e00\u6839\u7ebf\u4e0a\u5148\u540e\u8fdb\u884c\u7684\uff0c\u5c3d\u7ba1\u5b9e\u9645\u4e0a\u5b83\u4eec\u539f\u672c\u662f\u540c\u65f6\u5e76\u884c\u53d1\u751f\u7684\u3002<\/p>\n
      \u4e00\u822c\u6211\u4eec\u4f7f\u7528\u884d\u5408\u7684\u76ee\u7684\uff0c\u662f\u60f3\u8981\u5f97\u5230\u4e00\u4e2a\u80fd\u5728\u8fdc\u7a0b\u5206\u652f\u4e0a\u5e72\u51c0\u5e94\u7528\u7684\u8865\u4e01 \u2014 \u6bd4\u5982\u67d0\u4e9b\u9879\u76ee\u4f60\u4e0d\u662f\u7ef4\u62a4\u8005\uff0c\u4f46\u60f3\u5e2e\u70b9\u5fd9\u7684\u8bdd\uff0c\u6700\u597d\u7528\u884d\u5408\uff1a\u5148\u5728\u81ea\u5df1\u7684\u4e00\u4e2a\u5206\u652f\u91cc\u8fdb\u884c\u5f00\u53d1\uff0c\u5f53\u51c6\u5907\u5411\u4e3b\u9879\u76ee\u63d0\u4ea4\u8865\u4e01\u7684\u65f6\u5019\uff0c\u6839\u636e\u6700\u65b0\u7684\u00a0origin\/master\u00a0\u8fdb\u884c\u4e00\u6b21\u884d\u5408\u64cd\u4f5c\u7136\u540e\u518d\u63d0\u4ea4\uff0c\u8fd9\u6837\u7ef4\u62a4\u8005\u5c31\u4e0d\u9700\u8981\u505a\u4efb\u4f55\u6574\u5408\u5de5\u4f5c\uff08\u8bd1\u6ce8\uff1a\u5b9e\u9645\u4e0a\u662f\u628a\u89e3\u51b3\u5206\u652f\u8865\u4e01\u540c\u6700\u65b0\u4e3b\u5e72\u4ee3\u7801\u4e4b\u95f4\u51b2\u7a81\u7684\u8d23\u4efb\uff0c\u5316\u8f6c\u4e3a\u7531\u63d0\u4ea4\u8865\u4e01\u7684\u4eba\u6765\u89e3\u51b3\u3002\uff09\uff0c\u53ea\u9700\u6839\u636e\u4f60\u63d0\u4f9b\u7684\u4ed3\u5e93\u5730\u5740\u4f5c\u4e00\u6b21\u5feb\u8fdb\u5408\u5e76\uff0c\u6216\u8005\u76f4\u63a5\u91c7\u7eb3\u4f60\u63d0\u4ea4\u7684\u8865\u4e01\u3002<\/p>\n
      \u8bf7\u6ce8\u610f\uff0c\u5408\u5e76\u7ed3\u679c\u4e2d\u6700\u540e\u4e00\u6b21\u63d0\u4ea4\u6240\u6307\u5411\u7684\u5feb\u7167\uff0c\u65e0\u8bba\u662f\u901a\u8fc7\u884d\u5408\uff0c\u8fd8\u662f\u4e09\u65b9\u5408\u5e76\uff0c\u90fd\u4f1a\u5f97\u5230\u76f8\u540c\u7684\u5feb\u7167\u5185\u5bb9\uff0c\u53ea\u4e0d\u8fc7\u63d0\u4ea4\u5386\u53f2\u4e0d\u540c\u7f62\u4e86\u3002\u884d\u5408\u662f\u6309\u7167\u6bcf\u884c\u7684\u4fee\u6539\u6b21\u5e8f\u91cd\u6f14\u4e00\u904d\u4fee\u6539\uff0c\u800c\u5408\u5e76\u662f\u628a\u6700\u7ec8\u7ed3\u679c\u5408\u5728\u4e00\u8d77\u3002<\/p>\n
      \u6709\u8da3\u7684\u884d\u5408<\/h2>\n
      \u884d\u5408\u4e5f\u53ef\u4ee5\u653e\u5230\u5176\u4ed6\u5206\u652f\u8fdb\u884c\uff0c\u5e76\u4e0d\u4e00\u5b9a\u975e\u5f97\u6839\u636e\u5206\u5316\u4e4b\u524d\u7684\u5206\u652f\u3002\u4ee5\u56fe 3-31 \u7684\u5386\u53f2\u4e3a\u4f8b\uff0c\u6211\u4eec\u4e3a\u4e86\u7ed9\u670d\u52a1\u5668\u7aef\u4ee3\u7801\u6dfb\u52a0\u4e00\u4e9b\u529f\u80fd\u800c\u521b\u5efa\u4e86\u7279\u6027\u5206\u652f\u00a0server\uff0c\u7136\u540e\u63d0\u4ea4 C3 \u548c C4\u3002\u7136\u540e\u53c8\u4ece C3 \u7684\u5730\u65b9\u518d\u589e\u52a0\u4e00\u4e2aclient\u00a0\u5206\u652f\u6765\u5bf9\u5ba2\u6237\u7aef\u4ee3\u7801\u8fdb\u884c\u4e00\u4e9b\u76f8\u5e94\u4fee\u6539\uff0c\u6240\u4ee5\u63d0\u4ea4\u4e86 C8 \u548c C9\u3002\u6700\u540e\uff0c\u53c8\u56de\u5230\u00a0server\u00a0\u5206\u652f\u63d0\u4ea4\u4e86 C10\u3002<\/p>\n
      \u56fe 3-31. \u4ece\u4e00\u4e2a\u7279\u6027\u5206\u652f\u91cc\u518d\u5206\u51fa\u4e00\u4e2a\u7279\u6027\u5206\u652f\u7684\u5386\u53f2\u3002<\/p>\n
      \u5047\u8bbe\u5728\u63a5\u4e0b\u6765\u7684\u4e00\u6b21\u8f6f\u4ef6\u53d1\u5e03\u4e2d\uff0c\u6211\u4eec\u51b3\u5b9a\u5148\u628a\u5ba2\u6237\u7aef\u7684\u4fee\u6539\u5e76\u5230\u4e3b\u7ebf\u4e2d\uff0c\u800c\u6682\u7f13\u5e76\u5165\u670d\u52a1\u7aef\u8f6f\u4ef6\u7684\u4fee\u6539\uff08\u56e0\u4e3a\u8fd8\u9700\u8981\u8fdb\u4e00\u6b65\u6d4b\u8bd5\uff09\u3002\u8fd9\u4e2a\u65f6\u5019\uff0c\u6211\u4eec\u5c31\u53ef\u4ee5\u628a\u57fa\u4e8e\u00a0server\u00a0\u5206\u652f\u800c\u975e\u00a0master\u00a0\u5206\u652f\u7684\u6539\u53d8\uff08\u5373 C8 \u548c C9\uff09\uff0c\u8df3\u8fc7\u00a0server\u00a0\u76f4\u63a5\u653e\u5230\u00a0master\u00a0\u5206\u652f\u4e2d\u91cd\u6f14\u4e00\u904d\uff0c\u4f46\u8fd9\u9700\u8981\u7528\u00a0git rebase\u00a0\u7684\u00a0–onto\u00a0\u9009\u9879\u6307\u5b9a\u65b0\u7684\u57fa\u5e95\u5206\u652f\u00a0master\uff1a<\/p>\n
      $ git rebase --onto master server client\r\n<\/pre>\n
      \u8fd9\u597d\u6bd4\u5728\u8bf4\uff1a\u201c\u53d6\u51fa\u00a0client\u00a0\u5206\u652f\uff0c\u627e\u51fa\u00a0client\u00a0\u5206\u652f\u548c\u00a0erver\u00a0\u5206\u652f\u7684\u5171\u540c\u7956\u5148\u4e4b\u540e\u7684\u53d8\u5316\uff0c\u7136\u540e\u628a\u5b83\u4eec\u5728master\u00a0\u4e0a\u91cd\u6f14\u4e00\u904d\u201d\u3002\u662f\u4e0d\u662f\u6709\u70b9\u590d\u6742\uff1f\u4e0d\u8fc7\u5b83\u7684\u7ed3\u679c\u5982\u56fe 3-32 \u6240\u793a\uff0c\u975e\u5e38\u9177\uff08\u8bd1\u6ce8\uff1a\u867d\u7136\u00a0client\u00a0\u91cc\u7684 C8, C9 \u5728 C3 \u4e4b\u540e\uff0c\u4f46\u8fd9\u4ec5\u8868\u660e\u65f6\u95f4\u4e0a\u7684\u5148\u540e\uff0c\u800c\u975e\u5728 C3 \u4fee\u6539\u7684\u57fa\u7840\u4e0a\u8fdb\u4e00\u6b65\u6539\u52a8\uff0c\u56e0\u4e3a\u00a0server\u00a0\u548cclient\u00a0\u8fd9\u4e24\u4e2a\u5206\u652f\u5bf9\u5e94\u7684\u4ee3\u7801\u5e94\u8be5\u662f\u4e24\u5957\u6587\u4ef6\uff0c\u867d\u7136\u8fd9\u4e48\u8bf4\u4e0d\u662f\u5f88\u4e25\u683c\uff0c\u4f46\u5e94\u7406\u89e3\u4e3a\u5728 C3 \u65f6\u95f4\u70b9\u4e4b\u540e\uff0c\u5bf9\u53e6\u5916\u7684\u6587\u4ef6\u6240\u505a\u7684 C8\uff0cC9 \u4fee\u6539\uff0c\u653e\u5230\u4e3b\u5e72\u91cd\u6f14\u3002\uff09\uff1a<\/p>\n
      \u56fe 3-32. \u5c06\u7279\u6027\u5206\u652f\u4e0a\u7684\u53e6\u4e00\u4e2a\u7279\u6027\u5206\u652f\u884d\u5408\u5230\u5176\u4ed6\u5206\u652f\u3002<\/p>\n
      \u73b0\u5728\u53ef\u4ee5\u5feb\u8fdb\u00a0master\u00a0\u5206\u652f\u4e86\uff08\u89c1\u56fe 3-33\uff09\uff1a<\/p>\n
      $ git checkout master\r\n$ git merge client\r\n<\/pre>\n
      \u56fe 3-33. \u5feb\u8fdb master \u5206\u652f\uff0c\u4f7f\u4e4b\u5305\u542b client \u5206\u652f\u7684\u53d8\u5316\u3002<\/p>\n
      \u73b0\u5728\u6211\u4eec\u51b3\u5b9a\u628a\u00a0server\u00a0\u5206\u652f\u7684\u53d8\u5316\u4e5f\u5305\u542b\u8fdb\u6765\u3002\u6211\u4eec\u53ef\u4ee5\u76f4\u63a5\u628aserver\u00a0\u5206\u652f\u884d\u5408\u5230\u00a0master\uff0c\u800c\u4e0d\u7528\u624b\u5de5\u5207\u6362\u5230\u00a0server\u00a0\u5206\u652f\u540e\u518d\u6267\u884c\u884d\u5408\u64cd\u4f5c \u2014\u00a0git rebase [\u4e3b\u5206\u652f] [\u7279\u6027\u5206\u652f]\u00a0\u547d\u4ee4\u4f1a\u5148\u53d6\u51fa\u7279\u6027\u5206\u652f\u00a0server\uff0c\u7136\u540e\u5728\u4e3b\u5206\u652f\u00a0master\u00a0\u4e0a\u91cd\u6f14\uff1a<\/p>\n
      $ git rebase master server\r\n<\/pre>\n
      \u4e8e\u662f\uff0cserver\u00a0\u7684\u8fdb\u5ea6\u5e94\u7528\u5230\u00a0master\u00a0\u7684\u57fa\u7840\u4e0a\uff0c\u5982\u56fe 3-34 \u6240\u793a\uff1a<\/p>\n
      \u56fe 3-34. \u5728 master \u5206\u652f\u4e0a\u884d\u5408 server \u5206\u652f\u3002<\/p>\n
      \u7136\u540e\u5c31\u53ef\u4ee5\u5feb\u8fdb\u4e3b\u5e72\u5206\u652f\u00a0master\u00a0\u4e86\uff1a<\/p>\n
      $ git checkout master\r\n$ git merge server\r\n<\/pre>\n
      \u73b0\u5728\u00a0client\u00a0\u548c\u00a0server\u00a0\u5206\u652f\u7684\u53d8\u5316\u90fd\u5df2\u7ecf\u96c6\u6210\u5230\u4e3b\u5e72\u5206\u652f\u6765\u4e86\uff0c\u53ef\u4ee5\u5220\u6389\u5b83\u4eec\u4e86\u3002\u6700\u7ec8\u6211\u4eec\u7684\u63d0\u4ea4\u5386\u53f2\u4f1a\u53d8\u6210\u56fe 3-35 \u7684\u6837\u5b50\uff1a<\/p>\n
      $ git branch -d client\r\n$ git branch -d server\r\n<\/pre>\n
      \u56fe 3-35. \u6700\u7ec8\u7684\u63d0\u4ea4\u5386\u53f2<\/p>\n
      \u884d\u5408\u7684\u98ce\u9669<\/h2>\n
      \u5443\uff0c\u5947\u5999\u7684\u884d\u5408\u4e5f\u5e76\u975e\u5b8c\u7f8e\u65e0\u7f3a\uff0c\u8981\u7528\u5b83\u5f97\u9075\u5b88\u4e00\u6761\u51c6\u5219\uff1a<\/p>\n
      \u4e00\u65e6\u5206\u652f\u4e2d\u7684\u63d0\u4ea4\u5bf9\u8c61\u53d1\u5e03\u5230\u516c\u5171\u4ed3\u5e93\uff0c\u5c31\u5343\u4e07\u4e0d\u8981\u5bf9\u8be5\u5206\u652f\u8fdb\u884c\u884d\u5408\u64cd\u4f5c\u3002<\/strong><\/p>\n
      \u5982\u679c\u4f60\u9075\u5faa\u8fd9\u6761\u91d1\u79d1\u7389\u5f8b\uff0c\u5c31\u4e0d\u4f1a\u51fa\u5dee\u9519\u3002\u5426\u5219\uff0c\u4eba\u6c11\u7fa4\u4f17\u4f1a\u4ec7\u6068\u4f60\uff0c\u4f60\u7684\u670b\u53cb\u548c\u5bb6\u4eba\u4e5f\u4f1a\u5632\u7b11\u4f60\uff0c\u553e\u5f03\u4f60\u3002<\/p>\n
      \u5728\u8fdb\u884c\u884d\u5408\u7684\u65f6\u5019\uff0c\u5b9e\u9645\u4e0a\u629b\u5f03\u4e86\u4e00\u4e9b\u73b0\u5b58\u7684\u63d0\u4ea4\u5bf9\u8c61\u800c\u521b\u9020\u4e86\u4e00\u4e9b\u7c7b\u4f3c\u4f46\u4e0d\u540c\u7684\u65b0\u7684\u63d0\u4ea4\u5bf9\u8c61\u3002\u5982\u679c\u4f60\u628a\u539f\u6765\u5206\u652f\u4e2d\u7684\u63d0\u4ea4\u5bf9\u8c61\u53d1\u5e03\u51fa\u53bb\uff0c\u5e76\u4e14\u5176\u4ed6\u4eba\u66f4\u65b0\u4e0b\u8f7d\u540e\u5728\u5176\u57fa\u7840\u4e0a\u5f00\u5c55\u5de5\u4f5c\uff0c\u800c\u7a0d\u540e\u4f60\u53c8\u7528\u00a0git rebase\u00a0\u629b\u5f03\u8fd9\u4e9b\u63d0\u4ea4\u5bf9\u8c61\uff0c\u628a\u65b0\u7684\u91cd\u6f14\u540e\u7684\u63d0\u4ea4\u5bf9\u8c61\u53d1\u5e03\u51fa\u53bb\u7684\u8bdd\uff0c\u4f60\u7684\u5408\u4f5c\u8005\u5c31\u4e0d\u5f97\u4e0d\u91cd\u65b0\u5408\u5e76\u4ed6\u4eec\u7684\u5de5\u4f5c\uff0c\u8fd9\u6837\u5f53\u4f60\u518d\u6b21\u4ece\u4ed6\u4eec\u90a3\u91cc\u83b7\u53d6\u5185\u5bb9\u65f6\uff0c\u63d0\u4ea4\u5386\u53f2\u5c31\u4f1a\u53d8\u5f97\u4e00\u56e2\u7cdf\u3002<\/p>\n
      \u4e0b\u9762\u6211\u4eec\u7528\u4e00\u4e2a\u5b9e\u9645\u4f8b\u5b50\u6765\u8bf4\u660e\u4e3a\u4ec0\u4e48\u516c\u5f00\u7684\u884d\u5408\u4f1a\u5e26\u6765\u95ee\u9898\u3002\u5047\u8bbe\u4f60\u4ece\u4e00\u4e2a\u4e2d\u592e\u670d\u52a1\u5668\u514b\u9686\u7136\u540e\u5728\u5b83\u7684\u57fa\u7840\u4e0a\u641e\u4e86\u4e00\u4e9b\u5f00\u53d1\uff0c\u63d0\u4ea4\u5386\u53f2\u7c7b\u4f3c\u56fe 3-36 \u6240\u793a\uff1a<\/p>\n
      \u56fe 3-36. \u514b\u9686\u4e00\u4e2a\u4ed3\u5e93\uff0c\u5728\u5176\u57fa\u7840\u4e0a\u5de5\u4f5c\u4e00\u756a\u3002<\/p>\n
      \u73b0\u5728\uff0c\u67d0\u4eba\u5728 C1 \u7684\u57fa\u7840\u4e0a\u505a\u4e86\u4e9b\u6539\u53d8\uff0c\u5e76\u5408\u5e76\u4ed6\u81ea\u5df1\u7684\u5206\u652f\u5f97\u5230\u7ed3\u679c C6\uff0c\u63a8\u9001\u5230\u4e2d\u592e\u670d\u52a1\u5668\u3002\u5f53\u4f60\u6293\u53d6\u5e76\u5408\u5e76\u8fd9\u4e9b\u6570\u636e\u5230\u4f60\u672c\u5730\u7684\u5f00\u53d1\u5206\u652f\u4e2d\u540e\uff0c\u4f1a\u5f97\u5230\u5408\u5e76\u7ed3\u679c C7\uff0c\u5386\u53f2\u63d0\u4ea4\u4f1a\u53d8\u6210\u56fe 3-37 \u8fd9\u6837\uff1a<\/p>\n
      \u56fe 3-37. \u6293\u53d6\u4ed6\u4eba\u63d0\u4ea4\uff0c\u5e76\u5165\u81ea\u5df1\u4e3b\u5e72\u3002<\/p>\n
      \u63a5\u4e0b\u6765\uff0c\u90a3\u4e2a\u63a8\u9001 C6 \u4e0a\u6765\u7684\u4eba\u51b3\u5b9a\u7528\u884d\u5408\u53d6\u4ee3\u4e4b\u524d\u7684\u5408\u5e76\u64cd\u4f5c\uff1b\u7ee7\u800c\u53c8\u7528\u00a0git push –force\u00a0\u8986\u76d6\u4e86\u670d\u52a1\u5668\u4e0a\u7684\u5386\u53f2\uff0c\u5f97\u5230 C4’\u3002\u800c\u4e4b\u540e\u5f53\u4f60\u518d\u4ece\u670d\u52a1\u5668\u4e0a\u4e0b\u8f7d\u6700\u65b0\u63d0\u4ea4\u540e\uff0c\u4f1a\u5f97\u5230\uff1a<\/p>\n
      \u56fe 3-38. \u6709\u4eba\u63a8\u9001\u4e86\u884d\u5408\u540e\u5f97\u5230\u7684 C4’\uff0c\u4e22\u5f03\u4e86\u4f60\u4f5c\u4e3a\u5f00\u53d1\u57fa\u7840\u7684 C4 \u548c C6\u3002<\/p>\n
      \u4e0b\u8f7d\u66f4\u65b0\u540e\u9700\u8981\u5408\u5e76\uff0c\u4f46\u6b64\u65f6\u884d\u5408\u4ea7\u751f\u7684\u63d0\u4ea4\u5bf9\u8c61 C4′ \u7684 SHA-1 \u6821\u9a8c\u503c\u548c\u4e4b\u524d C4 \u5b8c\u5168\u4e0d\u540c\uff0c\u6240\u4ee5 Git \u4f1a\u628a\u5b83\u4eec\u5f53\u4f5c\u65b0\u7684\u63d0\u4ea4\u5bf9\u8c61\u5904\u7406\uff0c\u800c\u5b9e\u9645\u4e0a\u6b64\u523b\u4f60\u7684\u63d0\u4ea4\u5386\u53f2 C7 \u4e2d\u65e9\u5df2\u7ecf\u5305\u542b\u4e86 C4 \u7684\u4fee\u6539\u5185\u5bb9\uff0c\u4e8e\u662f\u5408\u5e76\u64cd\u4f5c\u4f1a\u628a C7 \u548c C4′ \u5408\u5e76\u4e3a C8\uff08\u89c1\u56fe 3-39\uff09:<\/p>\n
      \u56fe 3-39. \u4f60\u628a\u76f8\u540c\u7684\u5185\u5bb9\u53c8\u5408\u5e76\u4e86\u4e00\u904d\uff0c\u751f\u6210\u4e00\u4e2a\u65b0\u7684\u63d0\u4ea4 C8\u3002<\/p>\n
      C8 \u8fd9\u4e00\u6b65\u7684\u5408\u5e76\u662f\u8fdf\u65e9\u4f1a\u53d1\u751f\u7684\uff0c\u56e0\u4e3a\u53ea\u6709\u8fd9\u6837\u4f60\u624d\u80fd\u548c\u5176\u4ed6\u534f\u4f5c\u8005\u63d0\u4ea4\u7684\u5185\u5bb9\u4fdd\u6301\u540c\u6b65\u3002\u800c\u5728 C8 \u4e4b\u540e\uff0c\u4f60\u7684\u63d0\u4ea4\u5386\u53f2\u91cc\u5c31\u4f1a\u540c\u65f6\u5305\u542b C4 \u548c C4’\uff0c\u4e24\u8005\u6709\u7740\u4e0d\u540c\u7684 SHA-1 \u6821\u9a8c\u503c\uff0c\u5982\u679c\u7528\u00a0git log\u00a0\u67e5\u770b\u5386\u53f2\uff0c\u4f1a\u770b\u5230\u4e24\u4e2a\u63d0\u4ea4\u62e5\u6709\u76f8\u540c\u7684\u4f5c\u8005\u65e5\u671f\u4e0e\u8bf4\u660e\uff0c\u4ee4\u4eba\u8d39\u89e3\u3002\u800c\u66f4\u7cdf\u7684\u662f\uff0c\u5f53\u4f60\u628a\u8fd9\u6837\u7684\u5386\u53f2\u63a8\u9001\u5230\u670d\u52a1\u5668\u540e\uff0c\u4f1a\u518d\u6b21\u628a\u8fd9\u4e9b\u884d\u5408\u540e\u7684\u63d0\u4ea4\u5f15\u5165\u5230\u4e2d\u592e\u670d\u52a1\u5668\uff0c\u8fdb\u4e00\u6b65\u56f0\u6270\u5176\u4ed6\u4eba\uff08\u8bd1\u6ce8\uff1a\u8fd9\u4e2a\u4f8b\u5b50\u4e2d\uff0c\u51fa\u95ee\u9898\u7684\u8d23\u4efb\u65b9\u662f\u90a3\u4e2a\u53d1\u5e03\u4e86 C6 \u540e\u53c8\u7528\u884d\u5408\u53d1\u5e03 C4′ \u7684\u4eba\uff0c\u5176\u4ed6\u4eba\u4f1a\u56e0\u6b64\u53cd\u9988\u53cc\u91cd\u5386\u53f2\u5230\u5171\u4eab\u4e3b\u5e72\uff0c\u4ece\u800c\u6df7\u6dc6\u5927\u5bb6\u7684\u89c6\u542c\u3002\uff09\u3002<\/p>\n
      \u5982\u679c\u628a\u884d\u5408\u5f53\u6210\u4e00\u79cd\u5728\u63a8\u9001\u4e4b\u524d\u6e05\u7406\u63d0\u4ea4\u5386\u53f2\u7684\u624b\u6bb5\uff0c\u800c\u4e14\u4ec5\u4ec5\u884d\u5408\u90a3\u4e9b\u5c1a\u672a\u516c\u5f00\u7684\u63d0\u4ea4\u5bf9\u8c61\uff0c\u5c31\u6ca1\u95ee\u9898\u3002\u5982\u679c\u884d\u5408\u90a3\u4e9b\u5df2\u7ecf\u516c\u5f00\u7684\u63d0\u4ea4\u5bf9\u8c61\uff0c\u5e76\u4e14\u5df2\u7ecf\u6709\u4eba\u57fa\u4e8e\u8fd9\u4e9b\u63d0\u4ea4\u5bf9\u8c61\u5f00\u5c55\u4e86\u540e\u7eed\u5f00\u53d1\u5de5\u4f5c\u7684\u8bdd\uff0c\u5c31\u4f1a\u51fa\u73b0\u53eb\u4eba\u6cae\u4e27\u7684\u9ebb\u70e6\u3002<\/p>\n<\/div>\n
      <\/div>\n
      <\/div>\n
      git\u534f\u4f5c\u5de5\u4f5c\u65b9\u5f0f\u4e00\uff1a<\/b><\/div>\n
      \n
      \u6700\u7b80\u5355\u7684\u534f\u4f5c\u65b9\u5f0f\u4e4b\u4e00\uff1a\u5148\u5728\u81ea\u5df1\u7684\u7279\u6027\u5206\u652f\u4e2d\u5de5\u4f5c\u4e00\u6bb5\u65f6\u95f4\uff0c\u5b8c\u6210\u540e\u5408\u5e76\u5230\u81ea\u5df1\u7684\u00a0master\u00a0\u5206\u652f\uff1b\u7136\u540e\u4e0b\u8f7d\u5408\u5e76\u00a0origin\/master\u00a0\u4e0a\u7684\u66f4\u65b0\uff08\u5982\u679c\u6709\u7684\u8bdd\uff09\uff0c\u518d\u63a8\u56de\u8fdc\u7a0b\u670d\u52a1\u5668\u3002<\/p>\n<\/div>\n
      \n
      <\/div>\n
      git\u534f\u4f5c\u5de5\u4f5c\u65b9\u5f0f\u4e8c\uff1a<\/b><\/div>\n
      \u8bb8\u591a\u5f00\u53d1\u5c0f\u7ec4\u6539\u7528 Git \u5c31\u662f\u56e0\u4e3a\u5b83\u5141\u8bb8\u591a\u4e2a\u5c0f\u7ec4\u95f4\u5e76\u884c\u5de5\u4f5c\uff0c\u800c\u5728\u7a0d\u540e\u6070\u5f53\u65f6\u673a\u518d\u884c\u5408\u5e76\u3002\u901a\u8fc7\u5171\u4eab\u8fdc\u7a0b\u5206\u652f\u7684\u65b9\u5f0f\uff0c\u65e0\u9700\u5e72\u6270\u6574\u4f53\u9879\u76ee\u4ee3\u7801\u4fbf\u53ef\u4ee5\u5f00\u5c55\u5de5\u4f5c\uff0c\u56e0\u6b64\u4f7f\u7528 Git \u7684\u5c0f\u578b\u56e2\u961f\u95f4\u534f\u4f5c\u53ef\u4ee5\u53d8\u5f97\u975e\u5e38\u7075\u6d3b\u81ea\u7531\u3002<\/div>\n<\/div>\n
      <\/div>\n
      \n
      \u5b50\u6811\u5408\u5e76<\/h1>\n<\/div>\n
      \n
      \u5b50\u6811\u5f52\u5e76\u7684\u601d\u60f3\u662f\u4f60\u62e5\u6709\u4e24\u4e2a\u5de5\u7a0b\uff0c\u5176\u4e2d\u4e00\u4e2a\u9879\u76ee\u6620\u5c04\u5230\u53e6\u5916\u4e00\u4e2a\u9879\u76ee\u7684\u5b50\u76ee\u5f55\u4e2d\uff0c\u53cd\u8fc7\u6765\u4e5f\u4e00\u6837\u3002\u5f53\u4f60\u6307\u5b9a\u4e00\u4e2a\u5b50\u6811\u5f52\u5e76\uff0cGit\u53ef\u4ee5\u806a\u660e\u5730\u63a2\u77e5\u5176\u4e2d\u4e00\u4e2a\u662f\u53e6\u5916\u4e00\u4e2a\u7684\u5b50\u6811\u4ece\u800c\u5b9e\u73b0\u6b63\u786e\u7684\u5f52\u5e76\u2014\u2014\u8fd9\u76f8\u5f53\u795e\u5947\u3002<\/p>\n
      \u9996\u5148\u4f60\u5c06 Rack \u5e94\u7528\u52a0\u5165\u5230\u9879\u76ee\u4e2d\u3002\u4f60\u5c06 Rack \u9879\u76ee\u5f53\u4f5c\u4f60\u9879\u76ee\u4e2d\u7684\u4e00\u4e2a\u8fdc\u7a0b\u5f15\u7528\uff0c\u7136\u540e\u5c06\u5b83\u68c0\u51fa\u5230\u5b83\u81ea\u8eab\u7684\u5206\u652f\uff1a<\/p>\n
      $ git remote add rack_remote git@github.com:schacon\/rack.git\r\n$ git fetch rack_remote\r\nwarning: no common commits\r\nremote: Counting objects: 3184, done.\r\nremote: Compressing objects: 100% (1465\/1465), done.\r\nremote: Total 3184 (delta 1952), reused 2770 (delta 1675)\r\nReceiving objects: 100% (3184\/3184), 677.42 KiB | 4 KiB\/s, done.\r\nResolving deltas: 100% (1952\/1952), done.\r\nFrom git@github.com:schacon\/rack\r\n * [new branch]      build      -> rack_remote\/build\r\n * [new branch]      master     -> rack_remote\/master\r\n * [new branch]      rack-0.4   -> rack_remote\/rack-0.4\r\n * [new branch]      rack-0.9   -> rack_remote\/rack-0.9\r\n$ git checkout -b rack_branch rack_remote\/master\r\nBranch rack_branch set up to track remote branch refs\/remotes\/rack_remote\/master.\r\nSwitched to a new branch \"rack_branch\"\r\n<\/pre>\n
      \u73b0\u5728\u5728\u4f60\u7684rack_branch\u5206\u652f\u4e2d\u5c31\u6709\u4e86Rack\u9879\u76ee\u7684\u6839\u76ee\u5f55\uff0c\u800c\u4f60\u81ea\u5df1\u7684\u9879\u76ee\u5728master\u5206\u652f\u4e2d\u3002\u5982\u679c\u4f60\u5148\u68c0\u51fa\u5176\u4e2d\u4e00\u4e2a\u7136\u540e\u53e6\u5916\u4e00\u4e2a\uff0c\u4f60\u4f1a\u770b\u5230\u5b83\u4eec\u6709\u4e0d\u540c\u7684\u9879\u76ee\u6839\u76ee\u5f55\uff1a<\/p>\n
      $ ls\r\nAUTHORS           KNOWN-ISSUES   Rakefile      contrib           lib\r\nCOPYING           README         bin           example           test\r\n$ git checkout master\r\nSwitched to branch \"master\"\r\n$ ls\r\nREADME\r\n<\/pre>\n
      \u8981\u5c06 Rack \u9879\u76ee\u5f53\u4f5c\u5b50\u76ee\u5f55\u62c9\u53d6\u5230\u4f60\u7684master\u9879\u76ee\u4e2d\u3002\u4f60\u53ef\u4ee5\u5728 Git \u4e2d\u7528git read-tree\u6765\u5b9e\u73b0\u3002\u4f60\u4f1a\u5728\u7b2c9\u7ae0\u5b66\u5230\u66f4\u591a\u4e0eread-tree\u548c\u5b83\u7684\u670b\u53cb\u76f8\u5173\u7684\u4e1c\u897f\uff0c\u5f53\u524d\u4f60\u4f1a\u77e5\u9053\u5b83\u8bfb\u53d6\u4e00\u4e2a\u5206\u652f\u7684\u6839\u76ee\u5f55\u6811\u5230\u5f53\u524d\u7684\u6682\u5b58\u533a\u548c\u5de5\u4f5c\u76ee\u5f55\u3002\u4f60\u53ea\u8981\u5207\u6362\u56de\u4f60\u7684master\u5206\u652f\uff0c\u7136\u540e\u62c9\u53d6rack_branch\u5230\u4f60\u4e3b\u9879\u76ee\u7684master\u5206\u652f\u7684rack\u5b50\u76ee\u5f55\uff1a<\/p>\n
      $ git read-tree --prefix=rack\/ -u rack_branch\r\n<\/pre>\n
      \u5f53\u4f60\u63d0\u4ea4\u7684\u65f6\u5019\uff0c\u770b\u8d77\u6765\u5c31\u50cf\u4f60\u5728\u90a3\u4e2a\u5b50\u76ee\u5f55\u4e0b\u62e5\u6709Rack\u7684\u6587\u4ef6\u2014\u2014\u5c31\u50cf\u4f60\u4ece\u4e00\u4e2atarball\u91cc\u62f7\u8d1d\u7684\u4e00\u6837\u3002\u6709\u610f\u601d\u7684\u662f\u4f60\u53ef\u4ee5\u6bd4\u8f83\u5bb9\u6613\u5730\u5f52\u5e76\u5176\u4e2d\u4e00\u4e2a\u5206\u652f\u7684\u53d8\u66f4\u5230\u53e6\u5916\u4e00\u4e2a\u3002\u56e0\u6b64\uff0c\u5982\u679c Rack \u9879\u76ee\u66f4\u65b0\u4e86\uff0c\u4f60\u53ef\u4ee5\u901a\u8fc7\u5207\u6362\u5230\u90a3\u4e2a\u5206\u652f\u5e76\u6267\u884c\u62c9\u53d6\u6765\u83b7\u5f97\u4e0a\u6e38\u7684\u53d8\u66f4\uff1a<\/p>\n
      $ git checkout rack_branch\r\n$ git pull\r\n<\/pre>\n
      \u7136\u540e\uff0c\u4f60\u53ef\u4ee5\u5c06\u90a3\u4e9b\u53d8\u66f4\u5f52\u5e76\u56de\u4f60\u7684 master \u5206\u652f\u3002\u4f60\u53ef\u4ee5\u4f7f\u7528git merge -s subtree\uff0c\u5b83\u4f1a\u5de5\u4f5c\u7684\u5f88\u597d\uff1b\u4f46\u662f Git \u540c\u65f6\u4f1a\u628a\u5386\u53f2\u5f52\u5e76\u5230\u4e00\u8d77\uff0c\u8fd9\u53ef\u80fd\u4e0d\u662f\u4f60\u60f3\u8981\u7684\u3002\u4e3a\u4e86\u62c9\u53d6\u53d8\u66f4\u5e76\u9884\u7f6e\u63d0\u4ea4\u8bf4\u660e\uff0c\u9700\u8981\u5728-s subtree\u7b56\u7565\u9009\u9879\u7684\u540c\u65f6\u4f7f\u7528–squash\u548c–no-commit\u9009\u9879\u3002<\/p>\n
      $ git checkout master\r\n$ git merge --squash -s subtree --no-commit rack_branch\r\nSquash commit -- not updating HEAD\r\nAutomatic merge went well; stopped before committing as requested\r\n<\/pre>\n
      \u6240\u6709 Rack \u9879\u76ee\u7684\u53d8\u66f4\u90fd\u88ab\u5f52\u5e76\u53ef\u4ee5\u8fdb\u884c\u672c\u5730\u63d0\u4ea4\u3002\u4f60\u4e5f\u53ef\u4ee5\u505a\u76f8\u53cd\u7684\u4e8b\u60c5\u2014\u2014\u5728\u4f60\u4e3b\u5206\u652f\u7684rack\u76ee\u5f55\u91cc\u8fdb\u884c\u53d8\u66f4\u7136\u540e\u5f52\u5e76\u56derack_branch\u5206\u652f\uff0c\u7136\u540e\u5c06\u5b83\u4eec\u63d0\u4ea4\u7ed9\u7ef4\u62a4\u8005\u6216\u8005\u63a8\u9001\u5230\u4e0a\u6e38\u3002<\/p>\n
      \u4e3a\u4e86\u5f97\u5230rack\u5b50\u76ee\u5f55\u548c\u4f60rack_branch\u5206\u652f\u7684\u533a\u522b\u2014\u2014\u4ee5\u51b3\u5b9a\u4f60\u662f\u5426\u9700\u8981\u5f52\u5e76\u5b83\u4eec\u2014\u2014\u4f60\u4e0d\u80fd\u4f7f\u7528\u4e00\u822c\u7684diff\u547d\u4ee4\u3002\u800c\u662f\u5bf9\u4f60\u60f3\u6bd4\u8f83\u7684\u5206\u652f\u8fd0\u884cgit diff-tree\uff1a<\/p>\n
      $ git diff-tree -p rack_branch\r\n<\/pre>\n
      \u6216\u8005\uff0c\u4e3a\u4e86\u6bd4\u8f83\u4f60\u7684rack\u5b50\u76ee\u5f55\u548c\u670d\u52a1\u5668\u4e0a\u4f60\u62c9\u53d6\u65f6\u7684master\u5206\u652f\uff0c\u4f60\u53ef\u4ee5\u8fd0\u884c<\/p>\n
      $ git diff-tree -p rack_remote\/masterde>\r\n\r\n<\/pre>\n<\/div>\n","protected":false},"excerpt":{"rendered":"
      \u5b89\u88c5\uff1a # yum install curl-devel expat-devel gettext-devel  …<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[15],"tags":[312,310,311,94,270],"class_list":["post-381","post","type-post","status-publish","format-standard","hentry","category-linuxandroid","tag-devops","tag-git","tag-311","tag-94","tag-270"],"views":1678,"_links":{"self":[{"href":"http:\/\/www.max-shu.com\/blog\/index.php?rest_route=\/wp\/v2\/posts\/381","targetHints":{"allow":["GET"]}}],"collection":[{"href":"http:\/\/www.max-shu.com\/blog\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"http:\/\/www.max-shu.com\/blog\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"http:\/\/www.max-shu.com\/blog\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"http:\/\/www.max-shu.com\/blog\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=381"}],"version-history":[{"count":2,"href":"http:\/\/www.max-shu.com\/blog\/index.php?rest_route=\/wp\/v2\/posts\/381\/revisions"}],"predecessor-version":[{"id":383,"href":"http:\/\/www.max-shu.com\/blog\/index.php?rest_route=\/wp\/v2\/posts\/381\/revisions\/383"}],"wp:attachment":[{"href":"http:\/\/www.max-shu.com\/blog\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=381"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"http:\/\/www.max-shu.com\/blog\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=381"},{"taxonomy":"post_tag","embeddable":true,"href":"http:\/\/www.max-shu.com\/blog\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=381"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}