gergely
/
git-reference
1
0
Fork 0
Code Releases Activity

Fixed docs links to link to git-scm/docs

This commit is contained in:
Jeffrey Guenther 2012-05-15 22:06:49 -07:00
parent f7fb27242b
commit ea759dbf93
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
branching/index.html
View File

@ -38,7 +38,7 @@ layout: reference
<div class="box"> <div class="box">
<h2> <h2>
<span class="docs"> <span class="docs">
<a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-branch.html">docs</a> &nbsp; <a target="new" href="http://git-scm.com/docs/git-branch">docs</a> &nbsp;
<a target="new" href="http://progit.org/book/ch3-2.html">book</a> <a target="new" href="http://progit.org/book/ch3-2.html">book</a>
</span> </span>
<a name="branch">git branch</a> <a name="branch">git branch</a>
@ -49,7 +49,7 @@ layout: reference
<h2> <h2>
<span class="docs"> <span class="docs">
<a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-checkout.html">docs</a> &nbsp; <a target="new" href="http://git-scm.com/docs/git-checkout">docs</a> &nbsp;
<a target="new" href="http://progit.org/book/ch3-2.html">book</a> <a target="new" href="http://progit.org/book/ch3-2.html">book</a>
</span> </span>
<a name="checkout">git checkout</a> <a name="checkout">git checkout</a>
@ -226,7 +226,7 @@ Deleted branch testing (was 78b2670).
<div class="box"> <div class="box">
<h2> <h2>
<span class="docs"> <span class="docs">
<a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-merge.html">docs</a> &nbsp; <a target="new" href="http://git-scm.com/docs/git-merge">docs</a> &nbsp;
<a target="new" href="http://progit.org/book/ch3-2.html#basic_merging">book</a> <a target="new" href="http://progit.org/book/ch3-2.html#basic_merging">book</a>
</span> </span>
<a name="merge">git merge</a> <a name="merge">git merge</a>
@ -421,7 +421,7 @@ nearly every programming language.
<p>You can see that Git inserts standard merge conflict markers, much like <p>You can see that Git inserts standard merge conflict markers, much like
Subversion, into files when it gets a merge conflict. Now it's up to us Subversion, into files when it gets a merge conflict. Now it's up to us
to resolve them. We will do it manually here, but check out to resolve them. We will do it manually here, but check out
<a href="http://www.kernel.org/pub/software/scm/git/docs/git-mergetool.html">git mergetool</a> <a href="http://git-scm.com/docs/git-mergetool">git mergetool</a>
if you want Git to fire up a graphical mergetool if you want Git to fire up a graphical mergetool
(like kdiff3, emerge, p4merge, etc) instead. (like kdiff3, emerge, p4merge, etc) instead.
</p> </p>
@ -473,7 +473,7 @@ M README
<div class="box"> <div class="box">
<h2> <h2>
<span class="docs"> <span class="docs">
<a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-log.html">docs</a> &nbsp; <a target="new" href="http://git-scm.com/docs/git-log">docs</a> &nbsp;
<a target="new" href="http://progit.org/book/ch6-1.html#commit_ranges">book</a> <a target="new" href="http://progit.org/book/ch6-1.html#commit_ranges">book</a>
</span> </span>
<a name="log">git log</a> <a name="log">git log</a>
@ -693,7 +693,7 @@ ab5ab4c added erlang
<div class="box"> <div class="box">
<h2> <h2>
<span class="docs"> <span class="docs">
<a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-tag.html">docs</a> &nbsp; <a target="new" href="http://git-scm.com/docs/git-tag">docs</a> &nbsp;
<a target="new" href="http://progit.org/book/ch2-6.html">book</a> <a target="new" href="http://progit.org/book/ch2-6.html">book</a>
</span> </span>
<a name="tag">git tag</a> <a name="tag">git tag</a>