diff options
| author | Noah Lev <camelidcamel@gmail.com> | 2021-09-08 10:17:39 -0700 |
|---|---|---|
| committer | Joshua Nelson <github@jyn.dev> | 2021-09-08 12:36:10 -0500 |
| commit | ea9efd8873d839d37fff0b3c15eaa44574c82d8c (patch) | |
| tree | 58e73434f5bc5aed8eb8b2ca094786a54c1ea3ea /src/doc/rustc-dev-guide | |
| parent | 6daa71ca9c8919e5d1ad67622f9207955307f028 (diff) | |
| download | rust-ea9efd8873d839d37fff0b3c15eaa44574c82d8c.tar.gz rust-ea9efd8873d839d37fff0b3c15eaa44574c82d8c.zip | |
Clarify paragraph in "Keeping things up to date"
Diffstat (limited to 'src/doc/rustc-dev-guide')
| -rw-r--r-- | src/doc/rustc-dev-guide/src/git.md | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/doc/rustc-dev-guide/src/git.md b/src/doc/rustc-dev-guide/src/git.md index 72d28715188..ac03a3c0f7c 100644 --- a/src/doc/rustc-dev-guide/src/git.md +++ b/src/doc/rustc-dev-guide/src/git.md @@ -269,9 +269,9 @@ git push --force-with-lease (set origin to be the same as local) ``` To avoid merges as per the [No-Merge Policy](#no-merge-policy), you may want to use -`git config pull.ff only` (this will apply the config to the local repo). -to avoid merge conflicts while pulling, without needing -`--ff-only` or `--rebase` while `git pull`ing +`git config pull.ff only` (this will apply the config only to the local repo) +to ensure that Git doesn't create merge commits when `git pull`ing, without +needing to pass `--ff-only` or `--rebase` every time. You can also `git push --force-with-lease` from master to keep your origin's master in sync with upstream. |