Changes between Version 13 and Version 14 of GitTips

Timestamp:

06/26/2011 02:43:45 PM (13 years ago)

Author:

johnnyg

Comment:

add how to merge a topic branch

GitTips

@@ -101 +101 @@
 }}}
 
+== Delete the last commit ==
+
+{{{
+#!sh
+git reset --hard HEAD~1
+}}}
+
 == Delete a remote branch ==
 
@@ -108 +115 @@
 }}}
 
-== Delete the last commit ==
+== Merge a topic branch ==
 
+In this example we assume that your topic branch, <topic>, is off master and that you are currently in your topic branch
+
+ 1. Squash/reword/edit any commits if need be
 {{{
 #!sh
-git reset --hard HEAD~1
+git rebase -i master
 }}}
+ 1. Rebase your topic branch on top of current master
+{{{
+#!sh
+git rebase master
+}}}
+ 1. Change to master
+{{{
+#!sh
+git checkout master
+}}}
+ 1. ('''Fast-forward''') merge your topic branch into master
+{{{
+#!sh
+git merge <topic>
+}}}
+ 1. Delete your local topic branch (see above tip for remote deletion)
+{{{
+#!sh
+git branch -d <topic>
+}}}