From 61db5057fe2b8b58af4e029681140d4e515cf5f4 Mon Sep 17 00:00:00 2001 From: Patrick McCarty Date: Fri, 7 Aug 2009 20:03:58 -0700 Subject: [PATCH] Docs: CG: add more information about `git pull -r' --- Documentation/contributor/git-starting.itexi | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Documentation/contributor/git-starting.itexi b/Documentation/contributor/git-starting.itexi index 6d6d55e86c..5f25e683d7 100644 --- 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 -- 2.39.5