aboutsummaryrefslogtreecommitdiffstats
path: root/guides
diff options
context:
space:
mode:
authorGannon McGibbon <gannon.mcgibbon@gmail.com>2018-10-09 14:38:39 -0400
committerGitHub <noreply@github.com>2018-10-09 14:38:39 -0400
commit168a9728dd00069efe04fec4b59d29e3752fbfb3 (patch)
tree2c88ba813cb548226ceca1f84f7f90c2116c4963 /guides
parent1ddfee9d110025348648320cf098efe8f803f814 (diff)
parentcbafd5d225dc0fe4877cdcb92c032d5034558df9 (diff)
downloadrails-168a9728dd00069efe04fec4b59d29e3752fbfb3.tar.gz
rails-168a9728dd00069efe04fec4b59d29e3752fbfb3.tar.bz2
rails-168a9728dd00069efe04fec4b59d29e3752fbfb3.zip
Merge pull request #34075 from hakusaro/guides-reference-leases
Change contributing guide to suggest using safer force push
Diffstat (limited to 'guides')
-rw-r--r--guides/source/contributing_to_ruby_on_rails.md13
1 files changed, 7 insertions, 6 deletions
diff --git a/guides/source/contributing_to_ruby_on_rails.md b/guides/source/contributing_to_ruby_on_rails.md
index 1beadd78d6..ed47a0de0f 100644
--- a/guides/source/contributing_to_ruby_on_rails.md
+++ b/guides/source/contributing_to_ruby_on_rails.md
@@ -596,13 +596,13 @@ $ git rebase -i rails/master
< Choose 'squash' for all of your commits except the first one. >
< Edit the commit message to make sense, and describe all your changes. >
-$ git push fork my_new_branch -f
+$ git push fork my_new_branch --force-with-lease
```
You should be able to refresh the pull request on GitHub and see that it has
been updated.
-#### Updating pull request
+#### Updating a pull request
Sometimes you will be asked to make some changes to the code you have
already committed. This can include amending existing commits. In this
@@ -612,12 +612,13 @@ you can force push to your branch on GitHub as described earlier in
squashing commits section:
```bash
-$ git push fork my_new_branch -f
+$ git push fork my_new_branch --force-with-lease
```
-This will update the branch and pull request on GitHub with your new code. Do
-note that using force push may result in commits being lost on the remote branch; use it with care.
-
+This will update the branch and pull request on GitHub with your new code.
+By force pushing with `--force-with-lease`, git will more safely update
+the remote than with a typical `-f`, which can delete work from the remote
+that you don't already have.
### Older Versions of Ruby on Rails