docs/GettingStarted.html: [Git] Mention branch.master.rebase for the tracking branch.
authorNAKAMURA Takumi <geek4civic@gmail.com>
Fri, 12 Aug 2011 07:48:01 +0000 (07:48 +0000)
committerNAKAMURA Takumi <geek4civic@gmail.com>
Fri, 12 Aug 2011 07:48:01 +0000 (07:48 +0000)
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

index 5e1985ef132f0fea62c35f0d45c1472f62c4acfc..39104dff146c6d2c3c46925486c5904ffc6b9cda 100644 (file)
@@ -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>