be4311c07e14feb728abc6425ee606ffaa611a58 markd Fri Jan 22 06:46:58 2021 -0800 merge with master diff --git src/hg/htdocs/admin/git.html src/hg/htdocs/admin/git.html index 5b6207d..9cdd9d0 100755 --- src/hg/htdocs/admin/git.html +++ src/hg/htdocs/admin/git.html @@ -1,69 +1,69 @@ <!DOCTYPE html> <!--#set var="TITLE" value="Genome Browser Git Access" --> <!--#set var="ROOT" value=".." --> <!-- Relative paths to support mirror sites with non-standard GB docs install --> <!--#include virtual="$ROOT/inc/gbPageStart.html" --> <h1>Access Browser Code Using Git</h1> <p> <strong>Install Git:</strong><br> Install Git software version 1.6.2.2 or later. See the Git Community Handbook -<a href="http://book.git-scm.com/2_installing_git.html" target="_blank">installation</a> and -<a href="http://book.git-scm.com/2_setup_and_initialization.html" target="_blank">setup</a> +<a href="http://book.git-scm.com/book/en/v2/Getting-Started-Installing-Git" target="_blank">installation</a> and +<a href="http://book.git-scm.com/book/en/v2/Getting-Started-First-Time-Git-Setup" target="_blank">setup</a> instructions, as well as our <a href="http://genomewiki.ucsc.edu/index.php/Installing_git" target="_blank">Installing git</a> Genomewiki page.</p> <p> <strong>Start an initial Git local repository:</strong></p> <pre><code>$ git clone git://genome-source.soe.ucsc.edu/kent.git</code></pre> <p>Or, if a firewall prevents git daemon port 9418, use: <pre><code>$ git clone http://genome-source.soe.ucsc.edu/kent.git</code></pre> <p> The kent source tree will be imported to the current working directory in a directory named ./kent/.</p> <p> <strong>Track the beta branch at UCSC repository:</strong><br> Most users want to use the beta branch, which has tested, released versions of the browser. To -create a beta <a href="http://book.git-scm.com/4_tracking_branches.html" target="_blank">tracking +create a beta <a href="http://book.git-scm.com/book/en/v2/Git-Branching-Branches-in-a-Nutshell" target="_blank">tracking branch</a>: <pre><code>$ cd kent $ git checkout -t -b beta origin/beta</code></pre> <p> The <em>-b</em> creates a local branch with the name "beta", and checks it out.<br> The <em>-t</em> makes it a tracking branch, so that "git pull" pulls in updates from <em>origin/beta</em>, the "real" beta branch in our public central read-only repository.</p> <p> <strong>To get the latest UCSC release:</strong><br> Type this command From anywhere within the kent source tree:</p> <pre><code>$ git pull</code></pre> <p> <strong>To view the source via gitlist:</strong><br> Browse to <a href="http://genome-source.soe.ucsc.edu/gitlist/" target="_blank">http://genome-source.soe.ucsc.edu/gitlist/</a>.</p> <p> <strong>To construct a permanent URL to our source code files:</strong><br> 1. Boilerplate URL base:</p> <pre><code>http://genome-source.soe.ucsc.edu/gitlist/kent.git/raw/master/</code></pre> <p> 2. Add the path/file to the end:</p> <pre><code>src/makefile</code></pre> <p> <strong><em>Example:</em></strong> <pre><code><a href="http://genome-source.soe.ucsc.edu/gitlist/kent.git/raw/master/src/makefile" target="_blank">http://genome-source.soe.ucsc.edu/gitlist/kent.git/raw/master/src/makefile</a></code></pre> <p> <strong>Updates:</strong><br> UCSC generally updates the origin/beta branch every three weeks. If you are updating database tables for a mirror site, we recommend that you update the source at the same time, as source code is sometimes modified to include operations on new columns that have been added to database tables.</p> <p> See also: the README files in the source tree directory <em>src/product/README.*</em>. For instructions on keeping local tracks separate from UCSC Genome Browser tracks, see <em>src/product/README.trackDb</em>.</p> <p> For comments or questions, contact <a href="mailto:genome-mirror@cse.ucsc.edu">genome-mirror@cse.ucsc.edu</a>.</p> <!--#include virtual="$ROOT/inc/gbPageEnd.html" -->