From 7a362f4111b3620601acacc9691539a3d1f67b6f Mon Sep 17 00:00:00 2001
From: NAKAMURA Takumi <geek4civic@gmail.com>
Date: Fri, 12 Aug 2011 07:48:01 +0000
Subject: [PATCH] docs/GettingStarted.html: [Git] Mention branch.master.rebase
 for the tracking branch.

Thanks to Jeff Yasskin to reword.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@137443 91177308-0d34-0410-b5e6-96231b3b80d8
---
 docs/GettingStarted.html | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/docs/GettingStarted.html b/docs/GettingStarted.html
index 5e1985ef132..39104dff146 100644
--- a/docs/GettingStarted.html
+++ b/docs/GettingStarted.html
@@ -814,6 +814,19 @@ cd llvm/tools
 git clone http://llvm.org/git/clang.git
 </pre>
 
+<p>
+Since the upstream repository is in Subversion, you should use
+<tt>&quot;git pull --rebase&quot;</tt>
+instead of <tt>&quot;git pull&quot;</tt> to avoid generating a non-linear
+history in your clone.
+To configure <tt>&quot;git pull&quot;</tt> to pass <tt>--rebase</tt> by default
+on the master branch, run the following command:
+</p>
+
+<pre class="doc_code">
+git config branch.master.rebase true
+</pre>
+
 <h4>For developers to work with git-svn</h4>
 <div>