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

git.md: Fix No-Merge Policy link

This commit is contained in:
Dave 2021-07-28 18:05:43 +04:30 committed by Joshua Nelson
parent a7f22be835
commit f0900b2e0f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/git.md
View File

@ -268,7 +268,7 @@ git rebase master
git push --force-with-lease (set origin to be the same as local) 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 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). `git config pull.ff only` (this will apply the config to the local repo).
to avoid merge conflicts while pulling, without needing to avoid merge conflicts while pulling, without needing
`--ff-only` or `--rebase` while `git pull`ing `--ff-only` or `--rebase` while `git pull`ing