Changes between Version 55 and Version 56 of DeveloperGuidelines/Git

Timestamp:

05/18/12 15:18:28 (13 years ago)

Author:

Fran Boon

Comment:

Separate out the 'rebase post-facto'

DeveloperGuidelines/Git

@@ -122 +122 @@
 }}}
 
-=== Resetting to a previous commit ===
+==== Rebasing after pushing to GitHub ====
+Squash your commits if they are not in between two executions of git pull or git merge is:
+{{{
+# Stash your current work
+git stash
+# N = number of commits to squash
+git reset HEAD@{N}
+git commit -am 'Your commit message for the one-big-commit'
+# Push to your branch on GitHub, overwriting any previous code there
+git push origin +master
+# Restore your work in-progress
+git stash pop
+}}}
+
+
+
+==== Resetting to a previous commit ====
 There are two types of resets soft and hard.
 A soft reset is done like this:
@@ -142 +158 @@
 # Force update of GitHub
 git push origin +master
-}}}
-
-One more method to squash your commits if they are not in between two executions of git pull or git merge is:
-{{{
-git stash
-git reset HEAD@{N}
-git commit -am 'Your commit message for the one-big-commit'
-git push
-git stash pop
 }}}