From ef35a840980649aceddea6eb2a85ab242ac8557f Mon Sep 17 00:00:00 2001 From: Noah Lev Date: Wed, 8 Sep 2021 10:17:39 -0700 Subject: [PATCH] Clarify paragraph in "Keeping things up to date" --- src/git.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/git.md b/src/git.md index 72d28715..ac03a3c0 100644 --- a/src/git.md +++ b/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.