/
index.html
341 lines (211 loc) · 11 KB
/
index.html
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
<!DOCTYPE html>
<!--[if IEMobile 7 ]><html class="no-js iem7"><![endif]-->
<!--[if lt IE 9]><html class="no-js lte-ie8"><![endif]-->
<!--[if (gt IE 8)|(gt IEMobile 7)|!(IEMobile)|!(IE)]><!--><html class="no-js" lang="en"><!--<![endif]-->
<head>
<meta charset="utf-8">
<title>Git中如何退回到旧版本 - Wongyouth's Blog</title>
<meta name="author" content="Wongyouth">
<meta name="description" content="使用Git用来管理版本时，有时候会有不小心递交了错误的代码，想回退到旧的版本中的场景。让我们看看在Git中应该如何正确操作。 先来说一下如何保存当前工作区的修改。 保留当前修改 git stash # 保留当前工作区的修改
git stash pop # 恢复保存的修改到工作区 …">
<!-- http://t.co/dKP3o1e -->
<meta name="HandheldFriendly" content="True">
<meta name="MobileOptimized" content="320">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="canonical" href="http://wongyouth.github.com/blog/2012/10/25/return-to-old-revision-on-git-repo/">
<link href="/favicon.png" rel="icon">
<link href="/stylesheets/screen.css" media="screen, projection" rel="stylesheet" type="text/css">
<script src="/javascripts/modernizr-2.0.js"></script>
<script src="/javascripts/ender.js"></script>
<script src="/javascripts/octopress.js" type="text/javascript"></script>
<link href="/atom.xml" rel="alternate" title="Wongyouth's Blog" type="application/atom+xml">
<!--Fonts from Google"s Web font directory at http://google.com/webfonts -->
<link href="http://fonts.googleapis.com/css?family=PT+Serif:regular,italic,bold,bolditalic" rel="stylesheet" type="text/css">
<link href="http://fonts.googleapis.com/css?family=PT+Sans:regular,italic,bold,bolditalic" rel="stylesheet" type="text/css">
<script src="/javascripts/jiathis.js" type="text/javascript"></script>
<meta property="wb:webmaster" content="7f133defa7956d35" />
<meta property="qc:admins" content="544531077671754067140526375" />
<script type="text/javascript">
var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-30466888-1']);
_gaq.push(['_trackPageview']);
(function() {
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
</script>
</head>
<body >
<header role="banner"><hgroup>
<h1><a href="/">Wongyouth's Blog</a></h1>
<h2>Do things the stupid way.</h2>
</hgroup>
</header>
<nav role="navigation"><ul class="subscription" data-subscription="rss">
<li><a href="/atom.xml" rel="subscribe-rss" title="subscribe via RSS">RSS</a></li>
</ul>
<form action="http://google.com/search" method="get">
<fieldset role="search">
<input type="hidden" name="q" value="site:wongyouth.github.com" />
<input class="search" type="text" name="q" results="0" placeholder="Search"/>
</fieldset>
</form>
<ul class="main-navigation">
<li><a href="/">Blog</a></li>
<li><a href="/blog/archives">Archives</a></li>
</ul>
</nav>
<div id="main">
<div id="content">
<div>
<article class="hentry" role="article">
<header>
<h1 class="entry-title">Git中如何退回到旧版本</h1>
<p class="meta">
<time datetime="2012-10-25T09:34:00+08:00" pubdate data-updated="true">2012-10-25</time>
| <a href="#disqus_thread">Comments</a>
</p>
</header>
<div class="entry-content"><p>使用Git用来管理版本时，有时候会有不小心递交了错误的代码，想回退到旧的版本中的场景。让我们看看在Git中应该如何正确操作。</p>
<!-- more -->
<p>先来说一下如何保存当前工作区的修改。</p>
<h2>保留当前修改</h2>
<pre><code>git stash # 保留当前工作区的修改
git stash pop # 恢复保存的修改到工作区
</code></pre>
<h2>递交的代码没有push到远程的仓库时</h2>
<pre><code>git reset --mixed REVISION # 返回到旧版本REVISION，版本间的差异会到工作区
git reset --soft REVISION # 返回到旧版本REVISION，版本间的差异会到index
git reset --hard REVISION # 返回到旧版本REVISION，包括当前工作区里的修改
</code></pre>
<h2>递交的代码已经push到远程的仓库，协同者未同步时</h2>
<p>如果递交的代码已经push到了远程，我们不能用上面的方法，因为上面的方法只是让你的本地状态变成一个没有同步远程的协同者的状态相似。你下次pull远程时会把远程代码库的更新取回来。
所以我们必须要把远程的代码也返回到旧版。</p>
<pre><code>remote$ git config receive.denyCurrentBranch ignore # 登录到远程代码库，设置取消拒绝当前分支，否则以下的操作无法删除远程master分支
local$ git push origin :master # 删除远程master分支
local$ git reset --hard REVISION # return to old revision
local$ git push origin master:master # 递交旧版到远程master分支
</code></pre>
<p>或者回到旧版再强制推到远程</p>
<pre><code>local$ git reset --hard REVISION
local$ git push --force
</code></pre>
<h2>递交的代码已经更新到协同者的代码库时</h2>
<p>这个时候让每个协同者返回旧版不是一个好的选择项时，我们只有把旧代码取出，加到当前版之上，push到远程，再让协同者同步。</p>
</div>
<footer>
<p class="meta">
<span class="byline author vcard">Posted by <span class="fn">Wongyouth</span></span>
<time datetime="2012-10-25T09:34:00+08:00" pubdate data-updated="true">2012-10-25</time>
<span class="categories">
<a class='category' href='/blog/categories/git/'>git</a>
</span>
</p>
<div class="sharing">
<!-- JiaThis Button BEGIN -->
<div id="ckepop">
<span class="jiathis_txt">分享到：</span>
<a class="jiathis_button_icons_1"></a>
<a class="jiathis_button_icons_2"></a>
<a class="jiathis_button_icons_3"></a>
<a class="jiathis_button_icons_4"></a>
<a class="jiathis_button_icons_5"></a>
<a class="jiathis_button_icons_7"></a>
<a class="jiathis_button_icons_8"></a>
<a class="jiathis_button_icons_9"></a>
<a href="http://www.jiathis.com/share" class="jiathis jiathis_txt" target="_blank"></a>
<a class="jiathis_counter_style"></a>
<script type="text/javascript" src="http://v3.jiathis.com/code/jia.js?uid=1340085332390649" charset="utf-8"></script>
</div>
<!-- JiaThis Button END -->
<p />
</div>
<p class="meta">
<a class="basic-alignment left" href="/blog/2012/07/05/rails-development-oriented-vimfiles/" title="Previous Post: rails开发用 vimfiles 配置">« rails开发用 vimfiles 配置</a>
<a class="basic-alignment right" href="/blog/2012/11/05/make-a-git-repo-mirror-for-redmine/" title="Next Post: redmine用Git repo镜像脚本">redmine用Git repo镜像脚本 »</a>
</p>
</footer>
</article>
<section>
<h1>Comments</h1>
<div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
</div>
</section>
</div>
<aside class="sidebar">
<section>
<h1>近期博文</h1>
<ul id="recent_posts">
<li class="post">
<a href="/blog/2013/01/30/use-lvm-with-your-server/">use lvm with your server</a>
</li>
<li class="post">
<a href="/blog/2013/01/05/make-your-site-ssl-enabled/">让你的网站支持SSL</a>
</li>
<li class="post">
<a href="/blog/2012/12/20/migrate-data-from-mysql-to-postgresql-or-vice-versa/">migrate data from MySQL to PostgreSQL or vice versa</a>
</li>
<li class="post">
<a href="/blog/2012/11/05/make-a-git-repo-mirror-for-redmine/">redmine用Git repo镜像脚本</a>
</li>
<li class="post">
<a href="/blog/2012/10/25/return-to-old-revision-on-git-repo/">Git中如何退回到旧版本</a>
</li>
</ul>
</section>
<section>
<h1>分类</h1>
<ul id="category-list"><li><a href='/blog/categories/database'>database (1)</a></li><li><a href='/blog/categories/git'>git (4)</a></li><li><a href='/blog/categories/github'>github (1)</a></li><li><a href='/blog/categories/lvm'>lvm (1)</a></li><li><a href='/blog/categories/mongodb'>mongodb (1)</a></li><li><a href='/blog/categories/octopress'>octopress (1)</a></li><li><a href='/blog/categories/postgresql'>postgresql (1)</a></li><li><a href='/blog/categories/rails'>rails (4)</a></li><li><a href='/blog/categories/redmine'>redmine (1)</a></li><li><a href='/blog/categories/ruby'>ruby (2)</a></li><li><a href='/blog/categories/server'>server (1)</a></li><li><a href='/blog/categories/ubuntu'>ubuntu (4)</a></li><li><a href='/blog/categories/vim'>vim (1)</a></li></ul>
</section>
<section>
<h1>近期评论</h1>
<script type="text/javascript" src="http://wongyouth.disqus.com/recent_comments_widget.js?num_items=5&hide_avatars=0&avatar_size=32&excerpt_length=200"></script>
</section>
<section>
<h1>GitHub Repos</h1>
<ul id="gh_repos">
<li class="loading">Status updating...</li>
</ul>
<a href="https://github.com/wongyouth">@wongyouth</a> on GitHub
<script type="text/javascript">
$.domReady(function(){
if (!window.jXHR){
var jxhr = document.createElement('script');
jxhr.type = 'text/javascript';
jxhr.src = '/javascripts/libs/jXHR.js';
var s = document.getElementsByTagName('script')[0];
s.parentNode.insertBefore(jxhr, s);
}
github.showRepos({
user: 'wongyouth',
count: 0,
skip_forks: true,
target: '#gh_repos'
});
});
</script>
<script src="/javascripts/github.js" type="text/javascript"> </script>
</section>
</aside>
</div>
</div>
<footer role="contentinfo"><p>
Copyright © 2013 - Wongyouth -
<span class="credit">Powered by <a href="http://octopress.org">Octopress</a></span>
</p>
</footer>
<script type="text/javascript">
var disqus_shortname = 'wongyouth';
// var disqus_developer = 1;
var disqus_identifier = 'http://wongyouth.github.com/blog/2012/10/25/return-to-old-revision-on-git-repo/';
var disqus_url = 'http://wongyouth.github.com/blog/2012/10/25/return-to-old-revision-on-git-repo/';
var disqus_script = 'embed.js';
(function () {
var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
dsq.src = 'http://' + disqus_shortname + '.disqus.com/' + disqus_script;
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
}());
</script>
</body>
</html>