Changes between Version 15 and Version 16 of GitTips

Timestamp:

05/01/2013 06:21:43 PM (10 years ago)

Author:

Cas

Comment:

update tips

GitTips

@@ -5 +5 @@
 This page is a collection of useful git tips.
 
-== Apply a commit to multiple branches ==
+== Merge a feature branch ==
 
- 1. Checkout master branch
+In this example we assume that your feature branch, `myfeature`, is based off `develop` and that you are currently in your feature branch.
+
+ 1. Squash/reword/edit any commits if need be
 {{{
 #!sh
-git checkout master
+git rebase -i develop
 }}}
- 1. Make commit
+
+ 1. Rebase your feature branch on top of current develop
 {{{
 #!sh
-git commit -m "Fixed bug"
+git rebase develop
 }}}
- 1. Checkout stable branch
+ 1. Change to develop
 {{{
 #!sh
-git checkout stable
+git checkout develop
 }}}
- 1. Apply the last commit from master to this branch
+ 1. `Fast-forward` merge your feature branch into develop
 {{{
 #!sh
-git cherry-pick master
+git merge myfeature
 }}}
- 1. Repeat steps 3-4 as necessary
- 1. PROFIT!
+ 1. Delete your local feature branch (see above tip for remote deletion)
+{{{
+#!sh
+git branch -d myfeature
+}}}
 
 == Ignore changes in a tracked file ==
@@ -101 +107 @@
 }}}
 
+
+== Undo the last commit ==
+''Changes are put back into staged''
+{{{
+#!sh
+git reset --soft HEAD~1
+}}}
+
+
 == Delete the last commit ==
-
+''All changes are lost!''
 {{{
 #!sh
@@ -122 +137 @@
 }}}
 
-== Merge a topic branch ==
+== Apply a commit to multiple branches with cherry-pick ==
 
-In this example we assume that your topic branch, <topic>, is off master and that you are currently in your topic branch
+This technique uses cherry-pick to apply commits to branches that differ too much to use `merge`.
 
- 1. Squash/reword/edit any commits if need be
-{{{
-#!sh
-git rebase -i master
-}}}
- 1. Rebase your topic branch on top of current master
-{{{
-#!sh
-git rebase master
-}}}
- 1. Change to master
+ 1. Checkout `master` branch
 {{{
 #!sh
 git checkout master
 }}}
- 1. ('''Fast-forward''') merge your topic branch into master
+ 1. Make commit
 {{{
 #!sh
-git merge <topic>
+git commit -m "Fixed the bug that caused issue xyz"
 }}}
- 1. Delete your local topic branch (see above tip for remote deletion)
+ 1. Checkout stable branch
 {{{
 #!sh
-git branch -d <topic>
+git checkout stable
 }}}
+ 1. Apply the last commit from master to this branch
+{{{
+#!sh
+git cherry-pick master
+}}}