[llvm-commits] [llvm] r137443 - /llvm/trunk/docs/GettingStarted.html

[NAKAMURA Takumi]

Author: chapuni
Date: Fri Aug 12 02:48:01 2011
New Revision: 137443

URL: http://llvm.org/viewvc/llvm-project?rev=137443&view=rev
Log:
docs/GettingStarted.html: [Git] Mention branch.master.rebase for the tracking branch.

Thanks to Jeff Yasskin to reword.

Modified:
    llvm/trunk/docs/GettingStarted.html

Modified: llvm/trunk/docs/GettingStarted.html
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/GettingStarted.html?rev=137443&r1=137442&r2=137443&view=diff
==============================================================================
--- llvm/trunk/docs/GettingStarted.html (original)
+++ llvm/trunk/docs/GettingStarted.html Fri Aug 12 02:48:01 2011
@@ -814,6 +814,19 @@
 git clone http://llvm.org/git/clang.git
 </pre>
 
+<p>
+Since the upstream repository is in Subversion, you should use
+<tt>"git pull --rebase"</tt>
+instead of <tt>"git pull"</tt> to avoid generating a non-linear
+history in your clone.
+To configure <tt>"git pull"</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>