diff options
| author | Gourav Tiwari <gouravtiwari21@gmail.com> | 2015-05-19 12:43:33 -0700 |
|---|---|---|
| committer | Gourav Tiwari <gouravtiwari21@gmail.com> | 2015-05-19 20:26:11 +0000 |
| commit | a7e112651936d22cd2ef7df338c009dd48e61b5f (patch) | |
| tree | 574c8d4f31de6d738200dcb2eaf46825b41ad1bd /guides/source | |
| parent | 0e12300c5e685ddc1b26c99fdb790e54a93153d5 (diff) | |
| download | rails-a7e112651936d22cd2ef7df338c009dd48e61b5f.tar.gz rails-a7e112651936d22cd2ef7df338c009dd48e61b5f.tar.bz2 rails-a7e112651936d22cd2ef7df338c009dd48e61b5f.zip | |
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
Diffstat (limited to 'guides/source')
| -rw-r--r-- | guides/source/contributing_to_ruby_on_rails.md | 3 |
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. > |