Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Add detailed steps on how to squash multiple commits into a single de…

…tailed commit
  • Loading branch information...
commit 6df9c595ad8e473d15a81a9291e891476bc833c2 1 parent 861ec91
@fontno fontno authored
Showing with 25 additions and 0 deletions.
  1. +25 −0 guides/source/contributing_to_ruby_on_rails.md
View
25 guides/source/contributing_to_ruby_on_rails.md
@@ -325,6 +325,31 @@ You can also add bullet points:
TIP. Please squash your commits into a single commit when appropriate. This simplifies future cherry picks, and also keeps the git log clean.
+For example, to squash the previous three commits into one commit with a detailed commit message:
+
+```bash
+$ git rebase -i HEAD~3
+```
+
+Your editor will now open with the previous 3 commits listed:
+
+```
+pick 7ac1d4 description of first commit message
+pick 2b5aa3 description of second commit message
+pick da472c description of third commit message
+```
+
+Now squash the commits into the first commit
+
+```
+pick 7ac1d4 description of first commit message
+squash 2b5aa3 description of second commit message
+squash da472c description of third commit message
+```
+
+Ater saving and closing the editor, a new editor will open giving you the opportunity to write a detailed commit message for the newly squashed commit.
+
+
### Update Your Branch
It’s pretty likely that other changes to master have happened while you were working. Go get them:
Please sign in to comment.
Something went wrong with that request. Please try again.