Docs: CG: add more information about `git pull -r'

diff --git a/Documentation/contributor/git-starting.itexi b/Documentation/contributor/git-starting.itexi
index 6d6d55e86c358c9155a7a7076dd6326e8bed44f2..5f25e683d7891563fdd2f34896dd450e476f4196 100644 (file)
--- a/Documentation/contributor/git-starting.itexi
+++ b/Documentation/contributor/git-starting.itexi
@@ -175,6 +175,18 @@ the remote @code{git.sv.gnu.org} repository:
 git pull -r
 @end example
 
+@noindent
+The @code{-r} option is short for @code{--rebase}.  If you don't
+want to type @code{-r} every time, add @code{rebase = true} to the
+master branch in your @file{.git/config}, like so:
+
+@example
+[branch "master"]
+        remote = origin
+        merge = refs/heads/master
+        rebase = true
+@end example
+
 
 @node Resolving conflicts
 @subsection Resolving conflicts