Merge pull request #1461 from HonkingGoose/feature/add-note-how-to-get-rid-of-warnings-on-git-pull

Author: ben

book/02-git-basics/sections/remotes.asc

@@ -127,6 +127,18 @@ If your current branch is set up to track a remote branch (see the next section
 This may be an easier or more comfortable workflow for you; and by default, the `git clone` command automatically sets up your local `master` branch to track the remote `master` branch (or whatever the default branch is called) on the server you cloned from.
 Running `git pull` generally fetches data from the server you originally cloned from and automatically tries to merge it into the code you're currently working on.
 
+[NOTE]
+====
+From git version 2.27 onward, `git pull` will give a warning if the `pull.rebase` variable is not set.
+Git will keep warning you until you set the variable.
+
+If you want the default behavior of git (fast-forward if possible, else create a merge commit):
+`git config --global pull.rebase "false"`
+
+If you want to rebase when pulling:
+`git config --global pull.rebase "true"`
+====
+
 [[_pushing_remotes]]
 ==== Pushing to Your Remotes