Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ The prose, course text, slide layouts, class outlines, diagrams, HTML, CSS, and
------------------------

# Attribution 3.0 Unported (CC BY 3.0)
This is a [human-readable summary](http://creativecommons.org/licenses/by/3.0/deed.en_US) of the [Legal Code (the full license)](http://creativecommons.org/licenses/by/3.0/legalcode).
This is a [human-readable summary](https://creativecommons.org/licenses/by/3.0/deed.en_US) of the [Legal Code (the full license)](https://creativecommons.org/licenses/by/3.0/legalcode).


## You are free:
Expand Down Expand Up @@ -33,7 +33,7 @@ Notice — For any reuse or distribution, you must make clear to others the lice

# Attribution 3.0 Unported (CC BY 3.0)

http://creativecommons.org/licenses/by/3.0/legalcode
https://creativecommons.org/licenses/by/3.0/legalcode

CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS USE.

Expand Down Expand Up @@ -100,4 +100,4 @@ Creative Commons Notice
Creative Commons is not a party to this License, and makes no warranty whatsoever in connection with the Work. Creative Commons will not be liable to You or any party on any legal theory for any damages whatsoever, including without limitation any general, special, incidental or consequential damages arising in connection to this license. Notwithstanding the foregoing two (2) sentences, if Creative Commons has expressly identified itself as the Licensor hereunder, it shall have all rights and obligations of Licensor.
Except for the limited purpose of indicating to the public that the Work is licensed under the CCPL, Creative Commons does not authorize the use by either party of the trademark "Creative Commons" or any related trademark or logo of Creative Commons without the prior written consent of Creative Commons. Any permitted use will be in compliance with Creative Commons' then-current trademark usage guidelines, as may be published on its website or otherwise made available upon request from time to time. For the avoidance of doubt, this trademark restriction does not form part of this License.

Creative Commons may be contacted at http://creativecommons.org/.
Creative Commons may be contacted at https://creativecommons.org/.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ may be trying to do.

If you would like to know more about a command listed, each command
links to both the official manual page and its relevant chapter
in the [Pro Git book](http://git-scm.com/book).
in the [Pro Git book](https://git-scm.com/book).

## Contributing

Expand Down
32 changes: 16 additions & 16 deletions basic/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<div class="box">
<h2>
<span class="docs">
<a target="new" href="http://git-scm.com/book/en/Git-Basics-Recording-Changes-to-the-Repository">book</a>
<a target="new" href="https://git-scm.com/book/en/Git-Basics-Recording-Changes-to-the-Repository">book</a>
</span>
Basic Snapshotting
</h2>
Expand Down Expand Up @@ -38,8 +38,8 @@ <h2>
<div class="box">
<h2>
<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/book/en/Git-Basics-Recording-Changes-to-the-Repository#Tracking-New-Files">book</a>
<a target="new" href="https://git-scm.com/docs/git-add">docs</a> &nbsp;
<a target="new" href="https://git-scm.com/book/en/Git-Basics-Recording-Changes-to-the-Repository#Tracking-New-Files">book</a>
</span>
<a name="add">git add</a>
<span class="desc">adds file contents to the staging area</span>
Expand Down Expand Up @@ -130,8 +130,8 @@ <h2>
<div class="box">
<h2>
<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/book/en/Git-Basics-Recording-Changes-to-the-Repository#Checking-the-Status-of-Your-Files">book</a>
<a target="new" href="https://git-scm.com/docs/git-status">docs</a> &nbsp;
<a target="new" href="https://git-scm.com/book/en/Git-Basics-Recording-Changes-to-the-Repository#Checking-the-Status-of-Your-Files">book</a>
</span>
<a name="status">git status</a>
<span class="desc">view the status of your files in the working directory and staging area</span>
Expand Down Expand Up @@ -214,8 +214,8 @@ <h2>
<div class="box">
<h2>
<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/book/en/Git-Basics-Recording-Changes-to-the-Repository#Viewing-Your-Staged-and-Unstaged-Changes">book</a>
<a target="new" href="https://git-scm.com/docs/git-diff">docs</a> &nbsp;
<a target="new" href="https://git-scm.com/book/en/Git-Basics-Recording-Changes-to-the-Repository#Viewing-Your-Staged-and-Unstaged-Changes">book</a>
</span>
<a name="diff">git diff</a>
<span class="desc">shows diff of what is staged and what is modified but unstaged</span>
Expand All @@ -224,7 +224,7 @@ <h2>
<div class="block">
<p>There are two main uses of the <code>git diff</code> command. One use we
will describe here, the other we will describe later in the
<a href="/inspect">"Inspection and Comparison"</a>
<a href="{{ site.baseurl }}/inspect">"Inspection and Comparison"</a>
section. The way we're going to use it here is to describe the
changes that are staged or modified on disk but unstaged.</p>

Expand Down Expand Up @@ -416,8 +416,8 @@ <h4 id="diff-stat">
<div class="box">
<h2>
<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/book/en/Git-Basics-Recording-Changes-to-the-Repository#Committing-Your-Changes">book</a>
<a target="new" href="https://git-scm.com/docs/git-commit">docs</a> &nbsp;
<a target="new" href="https://git-scm.com/book/en/Git-Basics-Recording-Changes-to-the-Repository#Committing-Your-Changes">book</a>
</span>
<a name="commit">git commit</a>
<span class="desc">records a snapshot of the staging area</span>
Expand Down Expand Up @@ -596,8 +596,8 @@ <h4 id="commit-a">
<div class="box">
<h2>
<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/book/en/Git-Basics-Undoing-Things#Unstaging-a-Staged-File">book</a>
<a target="new" href="https://git-scm.com/docs/git-reset">docs</a> &nbsp;
<a target="new" href="https://git-scm.com/book/en/Git-Basics-Undoing-Things#Unstaging-a-Staged-File">book</a>
</span>
<a name="reset">git reset</a>
<span class="desc">undo changes and commits</span>
Expand Down Expand Up @@ -772,8 +772,8 @@ <h4 id="reset-hard">
<div class="box">
<h2>
<span class="docs">
<a href="http://git-scm.com/docs/git-rm">docs</a> &nbsp;
<a href="http://git-scm.com/book/en/Git-Basics-Recording-Changes-to-the-Repository#Removing-Files">book</a>
<a href="https://git-scm.com/docs/git-rm">docs</a> &nbsp;
<a href="https://git-scm.com/book/en/Git-Basics-Recording-Changes-to-the-Repository#Removing-Files">book</a>
</span>
<a name="rm-mv">git rm</a>
<span class="desc">remove files from the staging area</span>
Expand Down Expand Up @@ -828,8 +828,8 @@ <h4>
<div class="box">
<h2>
<span class="docs">
<a href="http://git-scm.com/docs/git-stash">docs</a> &nbsp;
<a href="http://git-scm.com/book/en/Git-Tools-Stashing">book</a>
<a href="https://git-scm.com/docs/git-stash">docs</a> &nbsp;
<a href="https://git-scm.com/book/en/Git-Tools-Stashing">book</a>
</span>
<a name="stash">git stash</a>
<span class="desc">save changes made in the current index and working directory for later</span>
Expand Down
26 changes: 13 additions & 13 deletions branching/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<div class="box">
<h2>
<span class="docs">
<a target="new" href="http://git-scm.com/book/en/Git-Branching">book</a>
<a target="new" href="https://git-scm.com/book/en/Git-Branching">book</a>
</span>
Branching and Merging
</h2>
Expand Down Expand Up @@ -38,8 +38,8 @@ <h2>
<div class="box">
<h2>
<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/book/en/Git-Branching-What-a-Branch-Is">book</a>
<a target="new" href="https://git-scm.com/docs/git-branch">docs</a> &nbsp;
<a target="new" href="https://git-scm.com/book/en/Git-Branching-What-a-Branch-Is">book</a>
</span>
<a name="branch">git branch</a>
<span class="desc">list, create and manage working contexts</span>
Expand All @@ -49,8 +49,8 @@ <h2>

<h2>
<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/book/en/Git-Branching-Basic-Branching-and-Merging">book</a>
<a target="new" href="https://git-scm.com/docs/git-checkout">docs</a> &nbsp;
<a target="new" href="https://git-scm.com/book/en/Git-Branching-Basic-Branching-and-Merging">book</a>
</span>
<a name="checkout">git checkout</a>
<span class="desc">switch to a new branch context</span>
Expand All @@ -72,7 +72,7 @@ <h4 id="branch-list">
<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
have a star next to it and if you have
<a href="http://git-scm.com/book/en/Customizing-Git-Git-Configuration#Colors-in-Git">coloring turned on</a>,
<a href="https://git-scm.com/book/en/Customizing-Git-Git-Configuration#Colors-in-Git">coloring turned on</a>,
will show the current branch in green.
</p>

Expand Down Expand Up @@ -273,8 +273,8 @@ <h4 id="branch-delete-remote">
<div class="box">
<h2>
<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/book/en/Git-Branching-Basic-Branching-and-Merging#Basic-Merging">book</a>
<a target="new" href="https://git-scm.com/docs/git-merge">docs</a> &nbsp;
<a target="new" href="https://git-scm.com/book/en/Git-Branching-Basic-Branching-and-Merging#Basic-Merging">book</a>
</span>
<a name="merge">git merge</a>
<span class="desc">merge a branch context into your current one</span>
Expand Down Expand Up @@ -467,7 +467,7 @@ <h4 id="merge-conflicts">
<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
to resolve them. We will do it manually here, but check out
<a href="http://git-scm.com/docs/git-mergetool">git mergetool</a>
<a href="https://git-scm.com/docs/git-mergetool">git mergetool</a>
if you want Git to fire up a graphical mergetool
(like kdiff3, emerge, p4merge, etc) instead.
</p>
Expand Down Expand Up @@ -519,8 +519,8 @@ <h4 id="merge-conflicts">
<div class="box">
<h2>
<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/book/en/Git-Tools-Revision-Selection#Commit-Ranges">book</a>
<a target="new" href="https://git-scm.com/docs/git-log">docs</a> &nbsp;
<a target="new" href="https://git-scm.com/book/en/Git-Tools-Revision-Selection#Commit-Ranges">book</a>
</span>
<a name="log">git log</a>
<span class="desc">show commit history of a branch</span>
Expand Down Expand Up @@ -743,8 +743,8 @@ <h2>
<div class="box">
<h2>
<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/book/en/Git-Basics-Tagging">book</a>
<a target="new" href="https://git-scm.com/docs/git-tag">docs</a> &nbsp;
<a target="new" href="https://git-scm.com/book/en/Git-Basics-Tagging">book</a>
</span>
<a name="tag">git tag</a>
<span class="desc">tag a point in history as important</span>
Expand Down
8 changes: 4 additions & 4 deletions creating/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ <h2>Getting and Creating Projects</h2>
<div class="box">
<h2>
<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/book/en/Git-Basics-Getting-a-Git-Repository#Initializing-a-Repository-in-an-Existing-Directory">book</a>
<a target="new" href="https://git-scm.com/docs/git-init">docs</a> &nbsp;
<a target="new" href="https://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository#Initializing-a-Repository-in-an-Existing-Directory">book</a>
</span>
<a name="init">git init</a>
<span class="desc">initializes a directory as a Git repository</span>
Expand Down Expand Up @@ -79,8 +79,8 @@ <h2>
<div class="box">
<h2>
<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/book/en/Git-Basics-Getting-a-Git-Repository#Cloning-an-Existing-Repository">book</a>
<a target="new" href="https://git-scm.com/docs/git-clone">docs</a> &nbsp;
<a target="new" href="https://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository#Cloning-an-Existing-Repository">book</a>
</span>
<a name="clone">git clone</a>
<span class="desc">copy a git repository so you can add to it</span>
Expand Down
4 changes: 2 additions & 2 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ <h2>Introduction to the Git Reference</h2>
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
Git documentation such as the official manual pages and relevant
sections in the <a href="http://git-scm.com/book">Pro Git book</a>,
sections in the <a href="https://git-scm.com/book">Pro Git book</a>,
so you can learn more about any of
the commands. First, we'll start with thinking about source code
management like Git does.
Expand Down Expand Up @@ -67,7 +67,7 @@ <h2>How to Think Like Git</h2>
</p>

<pre>
$ wget http://example.com/project.2010-06-01.zip
$ wget https://example.com/project.2010-06-01.zip
$ unzip project.2010-06-01.zip
$ cp -R project.2010-06-01 project-my-copy
$ cd project-my-copy
Expand Down
12 changes: 6 additions & 6 deletions inspect/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<div class="box">
<h2>
<span class="docs">
<a target="new" href="http://git-scm.com/book/en/Git-Basics-Viewing-the-Commit-History">book</a>
<a target="new" href="https://git-scm.com/book/en/Git-Basics-Viewing-the-Commit-History">book</a>
</span>
Inspection and Comparison
</h2>
Expand All @@ -30,8 +30,8 @@ <h2>
<div class="box">
<h2>
<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/book/en/Git-Basics-Viewing-the-Commit-History#Limiting-Log-Output">book</a>
<a target="new" href="https://git-scm.com/docs/git-log">docs</a> &nbsp;
<a target="new" href="https://git-scm.com/book/en/Git-Basics-Viewing-the-Commit-History#Limiting-Log-Output">book</a>
</span>
<a name="log">git log</a>
<span class="desc">filter your commit history</span>
Expand Down Expand Up @@ -309,8 +309,8 @@ <h4 id="log-stat">
<div class="box">
<h2>
<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/book/en/Distributed-Git-Maintaining-a-Project#Determining-What-Is-Introduced">book</a>
<a target="new" href="https://git-scm.com/docs/git-diff">docs</a> &nbsp;
<a target="new" href="https://git-scm.com/book/en/Distributed-Git-Maintaining-a-Project#Determining-What-Is-Introduced">book</a>
</span>
<a name="diff">git diff</a>
<span class="desc"></span>
Expand Down Expand Up @@ -472,4 +472,4 @@ <h2>
</div>

<p>And that's it! For more information, try reading the
<a href="http://git-scm.com/book/">Pro Git book</a>.</p>
<a href="https://git-scm.com/book/">Pro Git book</a>.</p>
20 changes: 10 additions & 10 deletions remotes/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<div class="box">
<h2>
<span class="docs">
<a target="new" href="http://git-scm.com/book/en/Git-Basics-Working-with-Remotes">book</a>
<a target="new" href="https://git-scm.com/book/en/Git-Basics-Working-with-Remotes">book</a>
</span>
Sharing and Updating Projects
</h2>
Expand Down Expand Up @@ -43,8 +43,8 @@ <h2>
<div class="box">
<h2>
<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/book/en/Git-Basics-Working-with-Remotes#Showing-Your-Remotes">book</a>
<a target="new" href="https://git-scm.com/docs/git-remote">docs</a> &nbsp;
<a target="new" href="https://git-scm.com/book/en/Git-Basics-Working-with-Remotes#Showing-Your-Remotes">book</a>
</span>
<a name="remote">git remote</a>
<span class="desc">list, add and delete remote repository aliases</span>
Expand Down Expand Up @@ -254,8 +254,8 @@ <h4 id="remote-update">
<div class="box">
<h2>
<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/book/en/Git-Basics-Working-with-Remotes#Fetching-and-Pulling-from-Your-Remotes">book</a>
<a target="new" href="https://git-scm.com/docs/git-fetch">docs</a> &nbsp;
<a target="new" href="https://git-scm.com/book/en/Git-Basics-Working-with-Remotes#Fetching-and-Pulling-from-Your-Remotes">book</a>
</span>
<a name="fetch">git fetch</a>
<span class="desc">download new branches and data from a remote repository</span>
Expand All @@ -265,8 +265,8 @@ <h2>

<h2>
<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/book/en/Git-Basics-Working-with-Remotes#Fetching-and-Pulling-from-Your-Remotes">book</a>
<a target="new" href="https://git-scm.com/docs/git-pull">docs</a> &nbsp;
<a target="new" href="https://git-scm.com/book/en/Git-Basics-Working-with-Remotes#Fetching-and-Pulling-from-Your-Remotes">book</a>
</span>
<a name="pull">git pull</a>
<span class="desc">fetch from a remote repo and try to merge into the current branch</span>
Expand All @@ -290,7 +290,7 @@ <h2>
<code>fetch</code> and <code>merge</code> commands separately involves less magic
and less problems, but if you like the idea of <code>pull</code>, you can
read about it in more detail in the
<a target="new" href="http://git-scm.com/docs/git-pull">official docs</a>.
<a target="new" href="https://git-scm.com/docs/git-pull">official docs</a>.
</p>

<p>Assuming you have a remote all set up and you want to pull in updates, you
Expand Down Expand Up @@ -350,8 +350,8 @@ <h2>
<div class="box">
<h2>
<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/book/en/Git-Basics-Working-with-Remotes#Pushing-to-Your-Remotes">book</a>
<a target="new" href="https://git-scm.com/docs/git-push">docs</a> &nbsp;
<a target="new" href="https://git-scm.com/book/en/Git-Basics-Working-with-Remotes#Pushing-to-Your-Remotes">book</a>
</span>
<a name="push">git push</a>
<span class="desc">push your new branches and data to a remote repository</span>
Expand Down
2 changes: 1 addition & 1 deletion zh/about.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
<h2>谁的作品?</h2>
<br/>
<p>Git 参考手册是 Github 项目组的成果。</p>
<p><a href="http://cyj.me">逸才</a>在 <a href="http://gitref.org">Git Reference</a> 的基础上做了中文翻译。</p>
<p><a href="https://cyj.me">逸才</a>在 <a href="https://git.github.io/git-reference">Git Reference</a> 的基础上做了中文翻译。</p>
</div>
Loading