mirror
/
rustc-dev-guide
mirror of https://github.com/rust-lang/rustc-dev-guide.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clarify paragraph in "Keeping things up to date"

This commit is contained in:
Noah Lev 2021-09-08 10:17:39 -07:00 committed by Joshua Nelson
parent f1b5e50437
commit ef35a84098
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/git.md
View File

@ -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.