Changes between Version 39 and Version 40 of DeveloperGuidelines/Git

Timestamp:

04/12/12 19:01:53 (13 years ago)

Author:

Fran Boon

Comment:

Squashing Commits

DeveloperGuidelines/Git

@@ -44 +44 @@
 * https://github.com/mygitusername/eden/pull/new/master
 
-
-If you didn't squash your commits, you may be asked to do so. This isn't directly possible once your code is Pushed, so instead you should create a patch & apply this to a clean cloen so that the pull request contains a single commit which is easy to review & applies cleanly.
+==== Squashing Commits ====
+If you didn't squash your commits before submitting the Pull Request, you may be asked to do so so that the pull request contains a single commit which is easy to review & applies cleanly.
+
+This isn't directly possible once your code is Pushed.
+
+Option 1:
+{{{
+git stash
+git checkout -b newbranch
+# Add an extra tilde per commit to squash (this assumes 2 commits)
+git reset HEAD~~
+git commit -am 'Sqashed!'
+}}}
+
+Option2: [[BR]]
+Create a patch & apply this to a clean clone.
 === Resolving Merge Conflicts ===
 If you encounter conflicts during the rebase, the conflicts will be tagged in the files with: