|
38 | 38 | <div class="box">
|
39 | 39 | <h2>
|
40 | 40 | <span class="docs">
|
41 |
| - <a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-branch.html">docs</a> |
| 41 | + <a target="new" href="http://git-scm.com/docs/git-branch">docs</a> |
42 | 42 | <a target="new" href="http://progit.org/book/ch3-2.html">book</a>
|
43 | 43 | </span>
|
44 | 44 | <a name="branch">git branch</a>
|
|
49 | 49 |
|
50 | 50 | <h2>
|
51 | 51 | <span class="docs">
|
52 |
| - <a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-checkout.html">docs</a> |
| 52 | + <a target="new" href="http://git-scm.com/docs/git-checkout">docs</a> |
53 | 53 | <a target="new" href="http://progit.org/book/ch3-2.html">book</a>
|
54 | 54 | </span>
|
55 | 55 | <a name="checkout">git checkout</a>
|
|
226 | 226 | <div class="box">
|
227 | 227 | <h2>
|
228 | 228 | <span class="docs">
|
229 |
| - <a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-merge.html">docs</a> |
| 229 | + <a target="new" href="http://git-scm.com/docs/git-merge">docs</a> |
230 | 230 | <a target="new" href="http://progit.org/book/ch3-2.html#basic_merging">book</a>
|
231 | 231 | </span>
|
232 | 232 | <a name="merge">git merge</a>
|
|
421 | 421 | <p>You can see that Git inserts standard merge conflict markers, much like
|
422 | 422 | Subversion, into files when it gets a merge conflict. Now it's up to us
|
423 | 423 | to resolve them. We will do it manually here, but check out
|
424 |
| - <a href="http://www.kernel.org/pub/software/scm/git/docs/git-mergetool.html">git mergetool</a> |
| 424 | + <a href="http://git-scm.com/docs/git-mergetool">git mergetool</a> |
425 | 425 | if you want Git to fire up a graphical mergetool
|
426 | 426 | (like kdiff3, emerge, p4merge, etc) instead.
|
427 | 427 | </p>
|
|
473 | 473 | <div class="box">
|
474 | 474 | <h2>
|
475 | 475 | <span class="docs">
|
476 |
| - <a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-log.html">docs</a> |
| 476 | + <a target="new" href="http://git-scm.com/docs/git-log">docs</a> |
477 | 477 | <a target="new" href="http://progit.org/book/ch6-1.html#commit_ranges">book</a>
|
478 | 478 | </span>
|
479 | 479 | <a name="log">git log</a>
|
|
693 | 693 | <div class="box">
|
694 | 694 | <h2>
|
695 | 695 | <span class="docs">
|
696 |
| - <a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-tag.html">docs</a> |
| 696 | + <a target="new" href="http://git-scm.com/docs/git-tag">docs</a> |
697 | 697 | <a target="new" href="http://progit.org/book/ch2-6.html">book</a>
|
698 | 698 | </span>
|
699 | 699 | <a name="tag">git tag</a>
|
|
0 commit comments