-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathatom.xml
More file actions
54 lines (39 loc) · 2.75 KB
/
atom.xml
File metadata and controls
54 lines (39 loc) · 2.75 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
<?xml version="1.0" encoding="utf-8"?>
<feed xmlns="http://www.w3.org/2005/Atom">
<title><![CDATA[Nuventure Tech]]></title>
<link href="http://nuventuretech.com/atom.xml" rel="self"/>
<link href="http://nuventuretech.com/"/>
<updated>2012-09-24T03:11:44+05:30</updated>
<id>http://nuventuretech.com/</id>
<author>
<name><![CDATA[Nuventure Technology Solutions]]></name>
<email><![CDATA[info@nuventure.in]]></email>
</author>
<generator uri="http://octopress.org/">Octopress</generator>
<entry>
<title type="html"><![CDATA[Rails 4 in a MindNode]]></title>
<link href="http://nuventuretech.com/blog/2012/09/24/rails-4-in-a-mindnode/"/>
<updated>2012-09-24T02:39:00+05:30</updated>
<id>http://nuventuretech.com/blog/2012/09/24/rails-4-in-a-mindnode</id>
<content type="html"><![CDATA[<p>A visualisation of what is being added, removed or deprecated in Rails 4.</p>
]]></content>
</entry>
<entry>
<title type="html"><![CDATA[Move commits from master to new branch]]></title>
<link href="http://nuventuretech.com/blog/2012/09/24/move-commits-from-master-to-new-branch/"/>
<updated>2012-09-24T01:37:00+05:30</updated>
<id>http://nuventuretech.com/blog/2012/09/24/move-commits-from-master-to-new-branch</id>
<content type="html"><![CDATA[<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>
]]></content>
</entry>
</feed>