Skip to content

Commit 4591985

Browse files
cobishcobish
committed
deploy blog
1 parent 0042ea9 commit 4591985

File tree

4 files changed

+123
-0
lines changed

4 files changed

+123
-0
lines changed

‎page/all.html‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,13 @@
1515
</div>
1616
<ul id="list">
1717

18+
<li class="list-post">
19+
<span class="date-long">2016-06-11</span>
20+
<a href="/%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/2016/06/11/git-fork-update.html">
21+
Git 同步 fork 的代码
22+
</a>
23+
</li>
24+
1825
<li class="list-post">
1926
<span class="date-long">2016-06-04</span>
2027
<a href="/%E5%89%8D%E7%AB%AF/2016/06/04/text-cut.html">

‎page/archive.html‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,17 @@ <h2 id="category">2016</h2>
2121

2222

2323

24+
<ul id="list">
25+
<li class="list-post">
26+
<span class="date-long">2016-06-11</span>
27+
<a href="/%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/2016/06/11/git-fork-update.html">
28+
Git 同步 fork 的代码
29+
</a>
30+
</li>
31+
</ul>
32+
33+
34+
2435
<ul id="list">
2536
<li class="list-post">
2637
<span class="date-long">2016-06-04</span>

‎page/tags.html‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,13 @@ <h2 id="category">前端</h2>
137137
<h2 id="category">版本控制</h2>
138138
<ul id="list">
139139

140+
<li class="list-post">
141+
<span class="date-long">2016-06-11</span>
142+
<a href="/%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/2016/06/11/git-fork-update.html">
143+
Git 同步 fork 的代码
144+
</a>
145+
</li>
146+
140147
<li class="list-post">
141148
<span class="date-long">2016-04-03</span>
142149
<a href="/%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/2016/04/03/git-command.html">

‎版本控制/2016/06/11/git-fork-update.html‎

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
5+
<meta name="viewport" content="width=device-width, initial-scale=1,user-scalable=no" />
6+
<title>Git 同步 fork 的代码</title>
7+
<link rel="shortcut icon" href="/assets/img/favicon.ico" />
8+
<link rel="stylesheet" type="text/css" href="/assets/css/fonts.css" media="screen" />
9+
<link rel="stylesheet" type="text/css" href="/assets/css/pygments.css">
10+
<link rel="stylesheet" type="text/css" href="/assets/css/index.css" media="screen" />
11+
</head>
12+
<body class="font-hei">
13+
<div id="logo">
14+
<a href="/">cobish.github.io</a>
15+
</div>
16+
<div class="article">
17+
<h3 class="article-title">Git 同步 fork 的代码</h3>
18+
<p class="article-time">2016-06-11， 浏览量：<span data-hk-page="current"> - </span> 次</p>
19+
<div class="article-desc article-content"><p>在 fork 了别人的一个项目，这时如果发现了别人的项目更新了，要怎么做才能把他更新的代码给拿过来呢？</p>
20+
21+
<p>首先需给 fork 的项目配置一个 remote。可以先查看远程状态。</p>
22+
<div class="highlight"><pre><code class="language-bash" data-lang="bash">➜ git remote -v
23+
origin git@github.com:cobish/fork-demo.git <span class="o">(</span>fetch<span class="o">)</span>
24+
origin git@github.com:cobish/fork-demo.git <span class="o">(</span>push<span class="o">)</span>
25+
</code></pre></div>
26+
<p>添加一个将被同步给 fork 远程的上游仓库。</p>
27+
<div class="highlight"><pre><code class="language-bash" data-lang="bash">➜ git remote add upstream https://github.com/wabish/fork-demo.git
28+
</code></pre></div>
29+
<p>然后再次查看远程状态，可以发现 fork 的仓库也被加进来了</p>
30+
<div class="highlight"><pre><code class="language-bash" data-lang="bash">➜ git remote -v
31+
origin git@github.com:cobish/fork-demo.git <span class="o">(</span>fetch<span class="o">)</span>
32+
origin git@github.com:cobish/fork-demo.git <span class="o">(</span>push<span class="o">)</span>
33+
upstream https://github.com/wabish/fork-demo.git <span class="o">(</span>fetch<span class="o">)</span>
34+
upstream https://github.com/wabish/fork-demo.git <span class="o">(</span>push<span class="o">)</span>
35+
</code></pre></div>
36+
<p>接下来就是使用 fetch 来更新代码了，fetch 后会被存储在一个本地分支 upstream/master 上。</p>
37+
<div class="highlight"><pre><code class="language-bash" data-lang="bash">➜ git fetch upstream
38+
remote: Counting objects: 3, <span class="k">done</span>.
39+
remote: Compressing objects: 100% <span class="o">(</span>2/2<span class="o">)</span>, <span class="k">done</span>.
40+
remote: Total <span class="m">3</span> <span class="o">(</span>delta 0<span class="o">)</span>, reused <span class="m">3</span> <span class="o">(</span>delta 0<span class="o">)</span>, pack-reused 0
41+
Unpacking objects: 100% <span class="o">(</span>3/3<span class="o">)</span>, <span class="k">done</span>.
42+
From https://github.com/wabish/fork-demo
43+
ee75d93..9b9d3cc master -&gt; upstream/master
44+
</code></pre></div>
45+
<p>这样就更新成功，但还需要将分支 upstream/master 合并到我们自己的 master 分支上。</p>
46+
<div class="highlight"><pre><code class="language-bash" data-lang="bash">➜ git merge upstream/master
47+
</code></pre></div>
48+
<p>到这里已经完成了同步 fork 上更新的代码，最后还需 push 到 Github 上。</p>
49+
<div class="highlight"><pre><code class="language-bash" data-lang="bash">➜ git push origin master
50+
</code></pre></div>
51+
<p>因为项目已经配置了 remote，所以如果下次 fork 的项目又更新的，只要在使用 fetch 和 merge 即可更新自己的项目上。</p>
52+
<div class="highlight"><pre><code class="language-bash" data-lang="bash">➜ git fetch upstream
53+
➜ git merge upstream/master
54+
</code></pre></div></div>
55+
</div>
56+
57+
<!-- <a id="showDs">
58+
显示评论
59+
</a> -->
60+
61+
<div id="ds" class="article">
62+
<!-- 多说评论框 -->
63+
<div class="ds-thread" data-thread-key="_posts/2016-06-11-git-fork-update.md" data-title="Git 同步 fork 的代码" data-url="/%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/2016/06/11/git-fork-update.html"></div>
64+
</div>
65+
66+
<script type="text/javascript">
67+
var duoshuoQuery = {short_name:"cobish"};
68+
(function() {
69+
var ds = document.createElement('script');
70+
ds.type = 'text/javascript';ds.async = true;
71+
ds.src = (document.location.protocol == 'https:' ? 'https:' : 'http:') + '//static.duoshuo.com/embed.js';
72+
ds.charset = 'UTF-8';
73+
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(ds);
74+
})();
75+
76+
// var showDs = document.getElementById('showDs'),
77+
// ds = document.getElementById('ds');
78+
//
79+
// showDs.onclick = function() {
80+
// showDs.style.display = 'none';
81+
// ds.style.display = 'block';
82+
// };
83+
</script>
84+
85+
<script src="https://cdn1.lncld.net/static/js/av-mini-0.6.10.js"></script>
86+
<script src="http://jerry-cdn.b0.upaiyun.com/hit-kounter/hit-kounter-lc-0.2.0.js"></script>
87+
<script>
88+
var _hmt = _hmt || [];
89+
(function() {
90+
var hm = document.createElement("script");
91+
hm.src = "//hm.baidu.com/hm.js?84602bc3713ca2aeb0258c55adf6a333";
92+
var s = document.getElementsByTagName("script")[0];
93+
s.parentNode.insertBefore(hm, s);
94+
})();
95+
</script>
96+
97+
</body>
98+
</html>

0 commit comments

Comments
 (0)