diff options
| author | Thomas von Deyen <tvd@magiclabs.de> | 2011-12-06 13:26:22 +0100 |
|---|---|---|
| committer | Thomas von Deyen <tvd@magiclabs.de> | 2011-12-06 13:26:57 +0100 |
| commit | 7e12aa7424d6db5468be0c78a4409e90d4454859 (patch) | |
| tree | f426a5de02e8a0a1dcb04dba3f021966fb4079be /railties/guides/source/contributing_to_ruby_on_rails.textile | |
| parent | bc994470c49fb17a6f984513c1299b94616ab83f (diff) | |
| download | rails-7e12aa7424d6db5468be0c78a4409e90d4454859.tar.gz rails-7e12aa7424d6db5468be0c78a4409e90d4454859.tar.bz2 rails-7e12aa7424d6db5468be0c78a4409e90d4454859.zip | |
Added git --rebase option for pulling rails master
Diffstat (limited to 'railties/guides/source/contributing_to_ruby_on_rails.textile')
| -rw-r--r-- | railties/guides/source/contributing_to_ruby_on_rails.textile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/guides/source/contributing_to_ruby_on_rails.textile b/railties/guides/source/contributing_to_ruby_on_rails.textile index 37ead2bff2..92cb0774de 100644 --- a/railties/guides/source/contributing_to_ruby_on_rails.textile +++ b/railties/guides/source/contributing_to_ruby_on_rails.textile @@ -336,7 +336,7 @@ It’s pretty likely that other changes to master have happened while you were w <shell> $ git checkout master -$ git pull +$ git pull --rebase </shell> Now reapply your patch on top of the latest changes: |