From a7e112651936d22cd2ef7df338c009dd48e61b5f Mon Sep 17 00:00:00 2001 From: Gourav Tiwari Date: Tue, 19 May 2015 12:43:33 -0700 Subject: updated squash docs-section [ci skip] I happen to squash my couple of commits and when followed steps from guide, I observed that I have to give a commit id after which I want to squash. If I don't provide one it picks last 3 commits, which might not include my commits to squash. Refer: http://stackoverflow.com/questions/5189560/squash-my-last-x-commits-together-using-git --- guides/source/contributing_to_ruby_on_rails.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'guides/source/contributing_to_ruby_on_rails.md') diff --git a/guides/source/contributing_to_ruby_on_rails.md b/guides/source/contributing_to_ruby_on_rails.md index 244add0aee..39a9826f21 100644 --- a/guides/source/contributing_to_ruby_on_rails.md +++ b/guides/source/contributing_to_ruby_on_rails.md @@ -579,8 +579,7 @@ following: ```bash $ git fetch upstream $ git checkout my_pull_request -$ git rebase upstream/master -$ git rebase -i +$ git rebase -i upstream/master < Choose 'squash' for all of your commits except the first one. > < Edit the commit message to make sense, and describe all your changes. > -- cgit v1.2.3