Changes between Version 97 and Version 98 of DeveloperGuidelines/Git

Timestamp:

03/31/14 20:22:13 (11 years ago)

Author:

Fran Boon

Comment:

Squashing Commits: simpler process

DeveloperGuidelines/Git

@@ -179 +179 @@
 >>>>>>> "My Changes"
 }}}
-You can correct these conflict in your code text editor, then add them andcontinue the rebase:
+You can correct these conflict in your code text editor, then add them and continue the rebase:
 {{{
 git add -u
@@ -217 +217 @@
 
 ==== Squashing commits ====
-
+Option 1:
+{{{
+git log
+# note hash of commit that you wish to squash all commits from
+git checkout <hash>
+git branch -b original
+git checkout master # Assuming you're working on master
+git rebase -i original
+}}}
+
+Option 2:
 {{{
 # Stash your current work
@@ -231 +241 @@
 }}}
 
-
-
 ==== Undoing a commit ====
 You may need to remove a commit you've made, either if you find you don't want it, or if it needs to be fixed. (Note if your commit has already been pushed to !GitHub and accepted into the trunk, then you should use a new commit to take out unwanted changes. This section only applies if you're fixing up your repository before the changes are in trunk.)
@@ -281 +289 @@
 * Optionally squash your commits.
 * Push your changes to !GitHub.
-* If your change contains more than one commit (and you are not doing a pull request yet) 
+* If your change contains more than one commit (and you are not doing a pull request yet)
+
 === Getting your changes accepted into the trunk repository ===
 
@@ -419 +428 @@
 git push origin master
 }}}
+
 == Developer Configuration ==
-
 Tell git your name and email, which it uses to identify you as the author of commits.
 And tell it your account on !GitHub.
@@ -447 +456 @@
 An alternative to diffmerge is Perforce's free P4V:
 * http://danlimerick.wordpress.com/2011/06/19/git-for-window-tip-use-p4merge-as-mergetool/
+
 === Windows ===
 Install [http://sourceforge.net/projects/console/ Console] & [http://www.sourcegear.com/diffmerge/downloads.php Diffmerge] & [http://markembling.info/2009/09/my-ideal-powershell-prompt-with-git-integration configure Powershell].