From f0900b2e0fe4adebe7bb23e5d1d017e66346f4e3 Mon Sep 17 00:00:00 2001 From: Dave Date: Wed, 28 Jul 2021 18:05:43 +0430 Subject: [PATCH] git.md: Fix No-Merge Policy link --- src/git.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/git.md b/src/git.md index 1c311982..72d28715 100644 --- a/src/git.md +++ b/src/git.md @@ -268,7 +268,7 @@ git rebase master 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). to avoid merge conflicts while pulling, without needing `--ff-only` or `--rebase` while `git pull`ing