1
0

Merge pull request #46 from randomecho/linkrot

Update progit.org links to git-scm.com book version
This commit is contained in:
Matthew McCullough 2012-12-04 07:04:54 -08:00
commit aa9f1de00c
6 changed files with 107 additions and 107 deletions

View File

@ -5,7 +5,7 @@ layout: reference
<div class="box"> <div class="box">
<h2> <h2>
<span class="docs"> <span class="docs">
<a target="new" href="http://progit.org/book/ch2-2.html">book</a> <a target="new" href="http://git-scm.com/book/en/Git-Basics-Recording-Changes-to-the-Repository">book</a>
</span> </span>
Basic Snapshotting Basic Snapshotting
</h2> </h2>
@ -39,7 +39,7 @@ layout: reference
<h2> <h2>
<span class="docs"> <span class="docs">
<a target="new" href="http://git-scm.com/docs/git-add">docs</a> &nbsp; <a target="new" href="http://git-scm.com/docs/git-add">docs</a> &nbsp;
<a target="new" href="http://progit.org/book/ch2-2.html#tracking_new_files">book</a> <a target="new" href="http://git-scm.com/book/en/Git-Basics-Recording-Changes-to-the-Repository#Tracking-New-Files">book</a>
</span> </span>
<a name="add">git add</a> <a name="add">git add</a>
<span class="desc">adds file contents to the staging area</span> <span class="desc">adds file contents to the staging area</span>
@ -131,7 +131,7 @@ layout: reference
<h2> <h2>
<span class="docs"> <span class="docs">
<a target="new" href="http://git-scm.com/docs/git-status">docs</a> &nbsp; <a target="new" href="http://git-scm.com/docs/git-status">docs</a> &nbsp;
<a target="new" href="http://progit.org/book/ch2-2.html#checking_the_status_of_your_files">book</a> <a target="new" href="http://git-scm.com/book/en/Git-Basics-Recording-Changes-to-the-Repository#Checking-the-Status-of-Your-Files">book</a>
</span> </span>
<a name="status">git status</a> <a name="status">git status</a>
<span class="desc">view the status of your files in the working directory and staging area</span> <span class="desc">view the status of your files in the working directory and staging area</span>
@ -215,7 +215,7 @@ layout: reference
<h2> <h2>
<span class="docs"> <span class="docs">
<a target="new" href="http://git-scm.com/docs/git-diff">docs</a> &nbsp; <a target="new" href="http://git-scm.com/docs/git-diff">docs</a> &nbsp;
<a target="new" href="http://progit.org/book/ch2-2.html#viewing_your_staged_and_unstaged_changes">book</a> <a target="new" href="http://git-scm.com/book/en/Git-Basics-Recording-Changes-to-the-Repository#Viewing-Your-Staged-and-Unstaged-Changes">book</a>
</span> </span>
<a name="diff">git diff</a> <a name="diff">git diff</a>
<span class="desc">shows diff of what is staged and what is modified but unstaged</span> <span class="desc">shows diff of what is staged and what is modified but unstaged</span>
@ -417,7 +417,7 @@ index 2aabb6e..2ae9ba4 100644
<h2> <h2>
<span class="docs"> <span class="docs">
<a target="new" href="http://git-scm.com/docs/git-commit">docs</a> &nbsp; <a target="new" href="http://git-scm.com/docs/git-commit">docs</a> &nbsp;
<a target="new" href="http://progit.org/book/ch2-2.html#committing_your_changes">book</a> <a target="new" href="http://git-scm.com/book/en/Git-Basics-Recording-Changes-to-the-Repository#Committing-Your-Changes">book</a>
</span> </span>
<a name="commit">git commit</a> <a name="commit">git commit</a>
<span class="desc">records a snapshot of the staging area</span> <span class="desc">records a snapshot of the staging area</span>
@ -597,7 +597,7 @@ Further paragraphs come after blank lines.
<h2> <h2>
<span class="docs"> <span class="docs">
<a target="new" href="http://git-scm.com/docs/git-reset">docs</a> &nbsp; <a target="new" href="http://git-scm.com/docs/git-reset">docs</a> &nbsp;
<a target="new" href="http://progit.org/book/ch2-4.html#unstaging_a_staged_file">book</a> <a target="new" href="http://git-scm.com/book/ch2-4.html#Unstaging-a-Staged-File">book</a>
</span> </span>
<a name="reset">git reset HEAD</a> <a name="reset">git reset HEAD</a>
<span class="desc">unstage changes that you have staged</span> <span class="desc">unstage changes that you have staged</span>
@ -695,7 +695,7 @@ M hello.rb
<h2> <h2>
<span class="docs"> <span class="docs">
<a href="http://git-scm.com/docs/git-rm">docs</a> &nbsp; <a href="http://git-scm.com/docs/git-rm">docs</a> &nbsp;
<a href="http://progit.org/book/ch2-2.html#removing_files">book</a> <a href="http://git-scm.com/book/en/Git-Basics-Recording-Changes-to-the-Repository#Removing-Files">book</a>
</span> </span>
<a name="rm-mv">git rm</a> <a name="rm-mv">git rm</a>
<span class="desc">remove files from the staging area</span> <span class="desc">remove files from the staging area</span>

View File

@ -5,7 +5,7 @@ layout: reference
<div class="box"> <div class="box">
<h2> <h2>
<span class="docs"> <span class="docs">
<a target="new" href="http://progit.org/book/ch3-0.html">book</a> <a target="new" href="http://git-scm.com/book/en/Git-Branching">book</a>
</span> </span>
Branching and Merging Branching and Merging
</h2> </h2>
@ -39,7 +39,7 @@ layout: reference
<h2> <h2>
<span class="docs"> <span class="docs">
<a target="new" href="http://git-scm.com/docs/git-branch">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://git-scm.com/book/en/Git-Branching-What-a-Branch-Is">book</a>
</span> </span>
<a name="branch">git branch</a> <a name="branch">git branch</a>
<span class="desc">list, create and manage working contexts</span> <span class="desc">list, create and manage working contexts</span>
@ -50,7 +50,7 @@ layout: reference
<h2> <h2>
<span class="docs"> <span class="docs">
<a target="new" href="http://git-scm.com/docs/git-checkout">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://git-scm.com/book/en/Git-Branching-Basic-Branching-and-Merging">book</a>
</span> </span>
<a name="checkout">git checkout</a> <a name="checkout">git checkout</a>
<span class="desc">switch to a new branch context</span> <span class="desc">switch to a new branch context</span>
@ -72,7 +72,7 @@ layout: reference
<p>Without arguments, <code>git branch</code> will list out the local <p>Without arguments, <code>git branch</code> will list out the local
branches that you have. The branch that you are currently working on will branches that you have. The branch that you are currently working on will
have a star next to it and if you have have a star next to it and if you have
<a href="http://progit.org/book/ch7-1.html#colors_in_git">coloring turned on</a>, <a href="http://git-scm.com/book/en/Customizing-Git-Git-Configuration#Colors-in-Git">coloring turned on</a>,
will show the current branch in green. will show the current branch in green.
</p> </p>
@ -227,7 +227,7 @@ Deleted branch testing (was 78b2670).
<h2> <h2>
<span class="docs"> <span class="docs">
<a target="new" href="http://git-scm.com/docs/git-merge">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://git-scm.com/book/en/Git-Branching-Basic-Branching-and-Merging#Basic-Merging">book</a>
</span> </span>
<a name="merge">git merge</a> <a name="merge">git merge</a>
<span class="desc">merge a branch context into your current one</span> <span class="desc">merge a branch context into your current one</span>
@ -473,7 +473,7 @@ M README
<h2> <h2>
<span class="docs"> <span class="docs">
<a target="new" href="http://git-scm.com/docs/git-log">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://git-scm.com/book/en/Git-Tools-Revision-Selection#Commit-Ranges">book</a>
</span> </span>
<a name="log">git log</a> <a name="log">git log</a>
<span class="desc">show commit history of a branch</span> <span class="desc">show commit history of a branch</span>
@ -696,7 +696,7 @@ ab5ab4c added erlang
<h2> <h2>
<span class="docs"> <span class="docs">
<a target="new" href="http://git-scm.com/docs/git-tag">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://git-scm.com/book/en/Git-Basics-Tagging">book</a>
</span> </span>
<a name="tag">git tag</a> <a name="tag">git tag</a>
<span class="desc">tag a point in history as important</span> <span class="desc">tag a point in history as important</span>

View File

@ -24,7 +24,7 @@ layout: reference
<h2> <h2>
<span class="docs"> <span class="docs">
<a target="new" href="http://git-scm.com/docs/git-init">docs</a> &nbsp; <a target="new" href="http://git-scm.com/docs/git-init">docs</a> &nbsp;
<a target="new" href="http://progit.org/book/ch2-1.html#initializing_a_repository_in_an_existing_directory">book</a> <a target="new" href="http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository#Initializing-a-Repository-in-an-Existing-Directory">book</a>
</span> </span>
<a name="init">git init</a> <a name="init">git init</a>
<span class="desc">initializes a directory as a Git repository</span> <span class="desc">initializes a directory as a Git repository</span>
@ -75,7 +75,7 @@ Initialized empty Git repository in /opt/konichiwa/.git/
<h2> <h2>
<span class="docs"> <span class="docs">
<a target="new" href="http://git-scm.com/docs/git-clone">docs</a> &nbsp; <a target="new" href="http://git-scm.com/docs/git-clone">docs</a> &nbsp;
<a target="new" href="http://progit.org/book/ch2-1.html#cloning_an_existing_repository">book</a> <a target="new" href="http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository#Cloning-an-Existing-Repository">book</a>
</span> </span>
<a name="clone">git clone</a> <a name="clone">git clone</a>
<span class="desc">copy a git repository so you can add to it</span> <span class="desc">copy a git repository so you can add to it</span>

View File

@ -16,7 +16,7 @@ layout: reference
Each section will link to the next section, so it can be used Each section will link to the next section, so it can be used
as a tutorial. Every page will also link to more in-depth as a tutorial. Every page will also link to more in-depth
Git documentation such as the official manual pages and relevant Git documentation such as the official manual pages and relevant
sections in the <a href="http://progit.org">Pro Git book</a>, sections in the <a href="http://git-scm.com/book">Pro Git book</a>,
so you can learn more about any of so you can learn more about any of
the commands. First, we'll start with thinking about source code the commands. First, we'll start with thinking about source code
management like Git does. management like Git does.

View File

@ -5,7 +5,7 @@ layout: reference
<div class="box"> <div class="box">
<h2> <h2>
<span class="docs"> <span class="docs">
<a target="new" href="http://progit.org/book/ch2-3.html">book</a> <a target="new" href="http://git-scm.com/book/en/Git-Basics-Viewing-the-Commit-History">book</a>
</span> </span>
Inspection and Comparison Inspection and Comparison
</h2> </h2>
@ -31,7 +31,7 @@ layout: reference
<h2> <h2>
<span class="docs"> <span class="docs">
<a target="new" href="http://git-scm.com/docs/git-log">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/ch2-3.html">book</a> <a target="new" href="http://git-scm.com/book/en/Git-Basics-Viewing-the-Commit-History#Limiting-Log-Output">book</a>
</span> </span>
<a name="log">git log</a> <a name="log">git log</a>
<span class="desc">filter your commit history</span> <span class="desc">filter your commit history</span>
@ -310,7 +310,7 @@ Date: Fri Jun 4 12:58:53 2010 +0200
<h2> <h2>
<span class="docs"> <span class="docs">
<a target="new" href="http://git-scm.com/docs/git-diff">docs</a> &nbsp; <a target="new" href="http://git-scm.com/docs/git-diff">docs</a> &nbsp;
<a target="new" href="http://progit.org/book/ch5-3.html#determining_what_is_introduced">book</a> <a target="new" href="http://git-scm.com/book/en/Distributed-Git-Maintaining-a-Project#Determining-What-Is-Introduced">book</a>
</span> </span>
<a name="diff">git diff</a> <a name="diff">git diff</a>
<span class="desc"></span> <span class="desc"></span>
@ -471,4 +471,4 @@ index bb86f00..192151c 100644
</div> </div>
<p>And that's it! For more information, try reading the <p>And that's it! For more information, try reading the
<a href="http://progit.org">Pro Git book</a>.</p> <a href="http://git-scm.com/book/">Pro Git book</a>.</p>

View File

@ -5,7 +5,7 @@ layout: reference
<div class="box"> <div class="box">
<h2> <h2>
<span class="docs"> <span class="docs">
<a target="new" href="http://progit.org/book/ch2-5.html">book</a> <a target="new" href="http://git-scm.com/book/en/Git-Basics-Working-with-Remotes">book</a>
</span> </span>
Sharing and Updating Projects Sharing and Updating Projects
</h2> </h2>
@ -44,7 +44,7 @@ layout: reference
<h2> <h2>
<span class="docs"> <span class="docs">
<a target="new" href="http://git-scm.com/docs/git-remote">docs</a> &nbsp; <a target="new" href="http://git-scm.com/docs/git-remote">docs</a> &nbsp;
<a target="new" href="http://progit.org/book/ch2-5.html#showing_your_remotes">book</a> <a target="new" href="http://git-scm.com/book/en/Git-Basics-Working-with-Remotes#Showing-Your-Remotes">book</a>
</span> </span>
<a name="remote">git remote</a> <a name="remote">git remote</a>
<span class="desc">list, add and delete remote repository aliases</span> <span class="desc">list, add and delete remote repository aliases</span>
@ -160,7 +160,7 @@ github git@github.com:schacon/hw.git (push)
<h2> <h2>
<span class="docs"> <span class="docs">
<a target="new" href="http://git-scm.com/docs/git-fetch">docs</a> &nbsp; <a target="new" href="http://git-scm.com/docs/git-fetch">docs</a> &nbsp;
<a target="new" href="http://progit.org/book/ch2-5.html#fetching_and_pulling_from_your_remotes">book</a> <a target="new" href="http://git-scm.com/book/en/Git-Basics-Working-with-Remotes#Fetching-and-Pulling-from-Your-Remotes">book</a>
</span> </span>
<a name="fetch">git fetch</a> <a name="fetch">git fetch</a>
<span class="desc">download new branches and data from a remote repository</span> <span class="desc">download new branches and data from a remote repository</span>
@ -171,7 +171,7 @@ github git@github.com:schacon/hw.git (push)
<h2> <h2>
<span class="docs"> <span class="docs">
<a target="new" href="http://git-scm.com/docs/git-pull">docs</a> &nbsp; <a target="new" href="http://git-scm.com/docs/git-pull">docs</a> &nbsp;
<a target="new" href="http://progit.org/book/">book</a> <a target="new" href="http://git-scm.com/book/en/Git-Basics-Working-with-Remotes#Fetching-and-Pulling-from-Your-Remotes">book</a>
</span> </span>
<a name="pull">git pull</a> <a name="pull">git pull</a>
<span class="desc">fetch from a remote repo and try to merge into the current branch</span> <span class="desc">fetch from a remote repo and try to merge into the current branch</span>
@ -255,7 +255,7 @@ From github.com:schacon/hw
<h2> <h2>
<span class="docs"> <span class="docs">
<a target="new" href="http://git-scm.com/docs/git-push">docs</a> &nbsp; <a target="new" href="http://git-scm.com/docs/git-push">docs</a> &nbsp;
<a target="new" href="http://progit.org/book/ch2-5.html#pushing_to_your_remotes">book</a> <a target="new" href="http://git-scm.com/book/en/Git-Basics-Working-with-Remotes#Pushing-to-Your-Remotes">book</a>
</span> </span>
<a name="push">git push</a> <a name="push">git push</a>
<span class="desc">push your new branches and data to a remote repository</span> <span class="desc">push your new branches and data to a remote repository</span>