-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathindex.html
More file actions
239 lines (126 loc) · 6.14 KB
/
index.html
File metadata and controls
239 lines (126 loc) · 6.14 KB
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
<!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>Nuventure Tech</title>
<meta name="author" content="Nuventure Technology Solutions">
<meta name="description" content="A visualisation of what is being added, removed or deprecated in Rails 4.
">
<!-- 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://nuventuretech.com/">
<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="Nuventure Tech" 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">
</head>
<body >
<header role="banner"><hgroup>
<h1><a href="/">Nuventure Tech</a></h1>
<h2>Devops with Ruby and Rails</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:nuventuretech.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 class="blog-index">
<article>
<header>
<h1 class="entry-title"><a href="/blog/2012/09/24/rails-4-in-a-mindnode/">Rails 4 in a MindNode</a></h1>
<p class="meta">
<time datetime="2012-09-24T02:39:00+05:30" pubdate data-updated="true">Sep 24<span>th</span>, 2012</time>
</p>
</header>
<div class="entry-content"><p>A visualisation of what is being added, removed or deprecated in Rails 4.</p>
</div>
</article>
<article>
<header>
<h1 class="entry-title"><a href="/blog/2012/09/24/move-commits-from-master-to-new-branch/">Move Commits From Master to New Branch</a></h1>
<p class="meta">
<time datetime="2012-09-24T01:37:00+05:30" pubdate data-updated="true">Sep 24<span>th</span>, 2012</time>
</p>
</header>
<div class="entry-content"><p>Ever found yourself committing to the master branch instead of having a separate branch for that new feature you are working on ? This handy tip will let you <em>move</em> those commits to a separate new branch keeping your master branch untouched. <strong>Note that this would only work if you haven’t pushed your changes to remote yet</strong>.</p>
<p><strong>Create a new branch from master</strong></p>
<figure class='code'><div class="highlight"><table><tr><td class="gutter"><pre class="line-numbers"><span class='line-number'>1</span>
</pre></td><td class='code'><pre><code class=''><span class='line'>$ git branch new-changes</span></code></pre></td></tr></table></div></figure>
<p>This would copy over the new commits from master to the newly created branch.</p>
<p><strong>Remove commits from master</strong></p>
<figure class='code'><div class="highlight"><table><tr><td class="gutter"><pre class="line-numbers"><span class='line-number'>1</span>
</pre></td><td class='code'><pre><code class=''><span class='line'>$ git reset --hard HEAD~3</span></code></pre></td></tr></table></div></figure>
<p>where 3 is the number of commits you have already made, that are to be moved over and unpushed to remote.</p>
<p>Now, you have a clean working copy of master branch, while retaining the new commits in the new branch.</p>
<p>Thanks to <a href="http://ariejan.net/2012/08/14/move-your-latest-commits-to-a-separate-branch">Ariejan</a> for the tip!</p>
</div>
</article>
<div class="pagination">
<a href="/blog/archives">Blog Archives</a>
</div>
</div>
<aside class="sidebar">
<section>
<h1>Recent Posts</h1>
<ul id="recent_posts">
<li class="post">
<a href="/blog/2012/09/24/rails-4-in-a-mindnode/">Rails 4 in a MindNode</a>
</li>
<li class="post">
<a href="/blog/2012/09/24/move-commits-from-master-to-new-branch/">Move commits from master to new branch</a>
</li>
</ul>
</section>
<section>
<h1>Latest Tweets</h1>
<ul id="tweets">
<li class="loading">Status updating…</li>
</ul>
<script type="text/javascript">
$.domReady(function(){
getTwitterFeed("nuventuretech", 4, false);
});
</script>
<script src="/javascripts/twitter.js" type="text/javascript"> </script>
<a href="http://twitter.com/nuventuretech" class="twitter-follow-button" data-show-count="false">Follow @nuventuretech</a>
</section>
</aside>
</div>
</div>
<footer role="contentinfo"><p>
Copyright © 2012 - Nuventure Technology Solutions -
<span class="credit">Powered by <a href="http://octopress.org">Octopress</a></span>
</p>
</footer>
<script type="text/javascript">
(function(){
var twitterWidgets = document.createElement('script');
twitterWidgets.type = 'text/javascript';
twitterWidgets.async = true;
twitterWidgets.src = 'http://platform.twitter.com/widgets.js';
document.getElementsByTagName('head')[0].appendChild(twitterWidgets);
})();
</script>
</body>
</html>