Changes between Version 7 and Version 8 of github

Timestamp:

10/21/13 11:28:31 (12 years ago)

Author:

admin

Comment:

--

github

@@ -78 +78 @@
 === apply a patch an make it uncommitted ===
 On the receiving side apply the patch as described above and the reset to the last commit before the patch using the "git reset --mixed <Hash of the commit before the temporary commit>" again
+
+== Squashing several commits into one ==
+After cherry-picking serveral commits into one new clean base one can consolidate the commits into one using the following commands:
+
+In the following example i have been working on the cm-10.2 branch and now want to consolidate all my last commits into one. The result should be in the cm-10.2 branch again.
+
+Move the current branch
+{{{
+git branch -m cm-10.2 cm-10.2_pff
+}}}
+Checkout the original branch again and merge the working branch.
+{{{
+git checkout -b cm-10.2 origin/cm-10.2
+git merge cm-10.2_pff
+}}}
+Reset the cm-10.2 branch to the original state.
+{{{
+git reset origin/cm-10.2
+}}}
+Now all the changes are unstaged and one can add and commit them again in one consolidated commit.
+{{{
+git add -A
+git commit
+}}}