aboutsummaryrefslogtreecommitdiffstats
path: root/guides/source/contributing_to_ruby_on_rails.md
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2015-05-19 18:32:03 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2015-05-19 18:32:03 -0300
commitffc3b33494fde0c628bd6ffa6d9b889b1e868aae (patch)
tree6bc1f7cb1ef46aefb63bc407f471faf2d4aba93b /guides/source/contributing_to_ruby_on_rails.md
parent046936481903dc46f48c81bd74eec4052624e40c (diff)
parenta7e112651936d22cd2ef7df338c009dd48e61b5f (diff)
downloadrails-ffc3b33494fde0c628bd6ffa6d9b889b1e868aae.tar.gz
rails-ffc3b33494fde0c628bd6ffa6d9b889b1e868aae.tar.bz2
rails-ffc3b33494fde0c628bd6ffa6d9b889b1e868aae.zip
Merge pull request #20213 from gouravtiwari/patch-8
updated squash docs-section [ci skip]
Diffstat (limited to 'guides/source/contributing_to_ruby_on_rails.md')
-rw-r--r--guides/source/contributing_to_ruby_on_rails.md3
1 files changed, 1 insertions, 2 deletions
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. >