Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SSH #134

Open
wants to merge 18 commits into
base: clearly-describe-rm-mv
Choose a base branch
from
+100 −104
Open

SSH #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
ce02730
Update Getting and Creating Projects Grammar
leaofelipe Apr 17, 2014
34feb99
笔误：知识 > 只是
nuysoft May 15, 2014
c5c1d1f
Update menu structure to reflect page structure
rosetree Sep 24, 2015
f789d71
Merge pull request #103 from rosetree/menu-structure
brntbeer Dec 1, 2015
b64bc94
Merge pull request #82 from nuysoft/patch-1
brntbeer Dec 7, 2015
4368290
Merge pull request #81 from leaofelipe/gh-pages
brntbeer Dec 30, 2015
ffee4fa
remove CNAME for deprecated URL
hectorsector Jun 15, 2017
af34105
Merge pull request #111 from hectorsector/patch-1
brntbeer Jun 16, 2017
a0843c1
update URL references
shawnajean Jun 19, 2017
0ad6f54
turns out, this is all we need
brntbeer Aug 15, 2017
ad210d9
appending this to the layout for the entire site makes the assets loa…
brntbeer Aug 15, 2017
5627497
add site.baseurl to next button at bottom of each page.
brntbeer Aug 15, 2017
9e06579
forgot to add proper baseurl for zh layout
brntbeer Aug 15, 2017
54e5202
site.baseurl for all links on side nav
brntbeer Aug 15, 2017
3d40a0f
Merge pull request #113 from shawnajean/gh-pages
brntbeer Aug 24, 2017
158ac05
missed one link missing baseurl on home page
brntbeer Aug 24, 2017
89872fb
update zh_reference with baseurl liquid tag
brntbeer Aug 24, 2017
0de29ad
Merge pull request #114 from git/site-baseurl-for-proper-asset-paths
brntbeer Aug 25, 2017
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
1 change: 0 additions & 1 deletion CNAME
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions _config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
baseurl: /git-reference
84 changes: 42 additions & 42 deletions _layouts/reference.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>Git Reference</title>
<link rel="stylesheet" type="text/css" href="/css/reset.css" media="screen" />
<link rel="stylesheet" type="text/css" href="/css/text.css" media="screen" />
<link rel="stylesheet" type="text/css" href="/css/grid.css" media="screen" />
<link rel="stylesheet" type="text/css" href="/css/layout.css" media="screen" />
<link rel="stylesheet" type="text/css" href="/css/nav.css" media="screen" />
<!--[if IE 6]><link rel="stylesheet" type="text/css" href="/css/ie6.css" media="screen" /><![endif]-->
<!--[if IE 7]><link rel="stylesheet" type="text/css" href="/css/ie.css" media="screen" /><![endif]-->
<script type="text/javascript" src="/js/jquery-1.4.1.min.js"></script>
<script type="text/javascript" src="/js/jquery-ui.min.js"></script>
<script type="text/javascript" src="/js/action.js"></script>
<link rel="stylesheet" type="text/css" href="{{ site.baseurl }}/css/reset.css" media="screen" />
<link rel="stylesheet" type="text/css" href="{{ site.baseurl }}/css/text.css" media="screen" />
<link rel="stylesheet" type="text/css" href="{{ site.baseurl }}/css/grid.css" media="screen" />
<link rel="stylesheet" type="text/css" href="{{ site.baseurl }}/css/layout.css" media="screen" />
<link rel="stylesheet" type="text/css" href="{{ site.baseurl }}/css/nav.css" media="screen" />
<!--[if IE 6]><link rel="stylesheet" type="text/css" href="{{ site.baseurl }}/css/ie6.css" media="screen" /><![endif]-->
<!--[if IE 7]><link rel="stylesheet" type="text/css" href="{{ site.baseurl }}/css/ie.css" media="screen" /><![endif]-->
<script type="text/javascript" src="{{ site.baseurl }}/js/jquery-1.4.1.min.js"></script>
<script type="text/javascript" src="{{ site.baseurl }}/js/jquery-ui.min.js"></script>
<script type="text/javascript" src="{{ site.baseurl }}/js/action.js"></script>
</head>
<body>
<div class="container_12">
Expand All @@ -23,9 +23,9 @@

<div class="grid_12">
<ul id="menu">
<li><a id="menu_home" href="/index.html">Reference</a></li>
<li><a id="menu_home" href="{{ site.baseurl }}/index.html">Reference</a></li>
<!-- <li><a id="menu_cookbook" href="/cookbook.html">Cookbook</a></li> -->
<li><a id="menu_about" href="/about.html">About</a></li>
<li><a id="menu_about" href="{{ site.baseurl }}/about.html">About</a></li>
<li>&#167;</li>
<li><a href="https://github.com/git/git-reference">Site Source</a></li>
</ul>
Expand All @@ -35,63 +35,63 @@

<div class="grid_2" id="reflist">
<div class="block">
<h3><a href="/creating">Getting and Creating Projects</a></h3>
<h3><a href="{{ site.baseurl }}/creating">Getting and Creating Projects</a></h3>
<ul>
<li><a href="/creating/#init">init</a></li>
<li><a href="/creating/#clone">clone</a></li>
<li><a href="{{ site.baseurl }}/creating/#init">init</a></li>
<li><a href="{{ site.baseurl }}/creating/#clone">clone</a></li>
</ul>
</div>

<div class="block">
<h3><a href="/basic">Basic Snapshotting</a></h3>
<h3><a href="{{ site.baseurl }}/basic">Basic Snapshotting</a></h3>
<ul>
<li><a href="/basic/#add">add</a></li>
<li><a href="/basic/#status">status</a></li>
<li><a href="/basic/#diff">diff</a></li>
<li><a href="/basic/#commit">commit</a></li>
<li><a href="/basic/#reset">reset</a></li>
<li><a href="/basic/#rm-mv">rm, mv</a></li>
<li><a href="/basic/#stash">stash</a></li>
<li><a href="{{ site.baseurl }}/basic/#add">add</a></li>
<li><a href="{{ site.baseurl }}/basic/#status">status</a></li>
<li><a href="{{ site.baseurl }}/basic/#diff">diff</a></li>
<li><a href="{{ site.baseurl }}/basic/#commit">commit</a></li>
<li><a href="{{ site.baseurl }}/basic/#reset">reset</a></li>
<li><a href="{{ site.baseurl }}/basic/#rm-mv">rm, mv</a></li>
<li><a href="{{ site.baseurl }}/basic/#stash">stash</a></li>
</ul>
</div>

<div class="block">
<h3><a href="/branching">Branching and Merging</a></h3>
<h3><a href="{{ site.baseurl }}/branching">Branching and Merging</a></h3>
<ul>
<li><a href="/branching/#branch">branch</a></li>
<li><a href="/branching/#branch">checkout</a></li>
<li><a href="/branching/#merge">merge</a></li>
<li><a href="/branching/#log">log</a></li>
<li><a href="/branching/#tag">tag</a></li>
<li><a href="{{ site.baseurl }}/branching/#branch">branch</a></li>
<li><a href="{{ site.baseurl }}/branching/#branch">checkout</a></li>
<li><a href="{{ site.baseurl }}/branching/#merge">merge</a></li>
<li><a href="{{ site.baseurl }}/branching/#log">log</a></li>
<li><a href="{{ site.baseurl }}/branching/#tag">tag</a></li>
</ul>
</div>

<div class="block">
<h3><a href="/remotes">Sharing and Updating Projects</a></h3>
<h3><a href="{{ site.baseurl }}/remotes">Sharing and Updating Projects</a></h3>
<ul>
<li><a href="/remotes/#fetch">fetch, pull</a></li>
<li><a href="/remotes/#push">push</a></li>
<li><a href="/remotes/#remote">remote</a></li>
<li><a href="{{ site.baseurl }}/remotes/#remote">remote</a></li>
<li><a href="{{ site.baseurl }}/remotes/#fetch">fetch, pull</a></li>
<li><a href="{{ site.baseurl }}/remotes/#push">push</a></li>
</ul>
</div>

<div class="block">
<h3><a href="/inspect">Inspection and Comparison</a></h3>
<h3><a href="{{ site.baseurl }}/inspect">Inspection and Comparison</a></h3>
<ul>
<li><a href="/inspect/#log">log</a></li>
<li><a href="/inspect/#diff">diff</a></li>
<li><a href="{{ site.baseurl }}/inspect/#log">log</a></li>
<li><a href="{{ site.baseurl }}/inspect/#diff">diff</a></li>
</ul>
</div>

<!--
<div class="block">
<h3><a href="/fixing">Fixing and Changing History</a></h3>
<h3><a href="fixing">Fixing and Changing History</a></h3>
<ul>
<li><a href="/fixing/rebase.html">rebase</a></li>
<li><a href="/fixing/revert.html">revert</a></li>
<li><a href="/fixing/checkout.html">checkout</a></li>
<li><a href="/fixing/reset.html">reset</a></li>
<li><a href="/fixing/cherry-pick.html">cherry-pick</a></li>
<li><a href="fixing/rebase.html">rebase</a></li>
<li><a href="fixing/revert.html">revert</a></li>
<li><a href="fixing/checkout.html">checkout</a></li>
<li><a href="fixing/reset.html">reset</a></li>
<li><a href="fixing/cherry-pick.html">cherry-pick</a></li>
</ul>
</div>
-->
Expand Down
84 changes: 42 additions & 42 deletions _layouts/zh_reference.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
<head>
<meta charset="utf-8" />
<title>Git 参考手册</title>
<link rel="stylesheet" type="text/css" href="/css/reset.css" media="screen" />
<link rel="stylesheet" type="text/css" href="/css/text.css" media="screen" />
<link rel="stylesheet" type="text/css" href="/css/grid.css" media="screen" />
<link rel="stylesheet" type="text/css" href="/css/layout.css" media="screen" />
<link rel="stylesheet" type="text/css" href="/css/nav.css" media="screen" />
<!--[if IE 6]><link rel="stylesheet" type="text/css" href="/css/ie6.css" media="screen" /><![endif]-->
<!--[if IE 7]><link rel="stylesheet" type="text/css" href="/css/ie.css" media="screen" /><![endif]-->
<script type="text/javascript" src="/js/jquery-1.4.1.min.js"></script>
<script type="text/javascript" src="/js/jquery-ui.min.js"></script>
<script type="text/javascript" src="/js/action.js"></script>
<link rel="stylesheet" type="text/css" href="{{ site.baseurl }}/css/reset.css" media="screen" />
<link rel="stylesheet" type="text/css" href="{{ site.baseurl }}/css/text.css" media="screen" />
<link rel="stylesheet" type="text/css" href="{{ site.baseurl }}/css/grid.css" media="screen" />
<link rel="stylesheet" type="text/css" href="{{ site.baseurl }}/css/layout.css" media="screen" />
<link rel="stylesheet" type="text/css" href="{{ site.baseurl }}/css/nav.css" media="screen" />
<!--[if IE 6]><link rel="stylesheet" type="text/css" href="{{ site.baseurl }}/css/ie6.css" media="screen" /><![endif]-->
<!--[if IE 7]><link rel="stylesheet" type="text/css" href="{{ site.baseurl }}/css/ie.css" media="screen" /><![endif]-->
<script type="text/javascript" src="{{ site.baseurl }}/js/jquery-1.4.1.min.js"></script>
<script type="text/javascript" src="{{ site.baseurl }}/js/jquery-ui.min.js"></script>
<script type="text/javascript" src="{{ site.baseurl }}/js/action.js"></script>
</head>
<body>
<div class="container_12">
Expand All @@ -23,9 +23,9 @@

<div class="grid_12">
<ul id="menu">
<li><a id="menu_home" href="/zh/index.html">参考手册</a></li>
<!-- <li><a id="menu_cookbook" href="/zh/cookbook.html">Cookbook</a></li> -->
<li><a id="menu_about" href="/zh/about.html">关于</a></li>
<li><a id="menu_home" href="{{ site.baseurl }}/zh/index.html">参考手册</a></li>
<!-- <li><a id="menu_cookbook" href="zh/cookbook.html">Cookbook</a></li> -->
<li><a id="menu_about" href="{{ site.baseurl }}/zh/about.html">关于</a></li>
<li>&#167;</li>
<li><a href="https://github.com/git/git-reference">网站源码</a></li>
</ul>
Expand All @@ -35,62 +35,62 @@

<div class="grid_2" id="reflist">
<div class="block">
<h3><a href="/zh/creating">获取与创建项目</a></h3>
<h3><a href="{{ site.baseurl }}/zh/creating">获取与创建项目</a></h3>
<ul>
<li><a href="/zh/creating/#init">init</a></li>
<li><a href="/zh/creating/#clone">clone</a></li>
<li><a href="{{ site.baseurl }}/zh/creating/#init">init</a></li>
<li><a href="{{ site.baseurl }}/zh/creating/#clone">clone</a></li>
</ul>
</div>

<div class="block">
<h3><a href="/zh/basic">基本的快照</a></h3>
<h3><a href="{{ site.baseurl }}/zh/basic">基本的快照</a></h3>
<ul>
<li><a href="/zh/basic/#add">add</a></li>
<li><a href="/zh/basic/#status">status</a></li>
<li><a href="/zh/basic/#diff">diff</a></li>
<li><a href="/zh/basic/#commit">commit</a></li>
<li><a href="/zh/basic/#reset">reset</a></li>
<li><a href="/zh/basic/#rm-mv">rm, mv</a></li>
<li><a href="{{ site.baseurl }}/zh/basic/#add">add</a></li>
<li><a href="{{ site.baseurl }}/zh/basic/#status">status</a></li>
<li><a href="{{ site.baseurl }}/zh/basic/#diff">diff</a></li>
<li><a href="{{ site.baseurl }}/zh/basic/#commit">commit</a></li>
<li><a href="{{ site.baseurl }}/zh/basic/#reset">reset</a></li>
<li><a href="{{ site.baseurl }}/zh/basic/#rm-mv">rm, mv</a></li>
</ul>
</div>

<div class="block">
<h3><a href="/zh/branching">分支与合并</a></h3>
<h3><a href="{{ site.baseurl }}/zh/branching">分支与合并</a></h3>
<ul>
<li><a href="/zh/branching/#branch">branch</a></li>
<li><a href="/zh/branching/#branch">checkout</a></li>
<li><a href="/zh/branching/#merge">merge</a></li>
<li><a href="/zh/branching/#log">log</a></li>
<li><a href="/zh/branching/#tag">tag</a></li>
<li><a href="{{ site.baseurl }}/zh/branching/#branch">branch</a></li>
<li><a href="{{ site.baseurl }}/zh/branching/#branch">checkout</a></li>
<li><a href="{{ site.baseurl }}/zh/branching/#merge">merge</a></li>
<li><a href="{{ site.baseurl }}/zh/branching/#log">log</a></li>
<li><a href="{{ site.baseurl }}/zh/branching/#tag">tag</a></li>
</ul>
</div>

<div class="block">
<h3><a href="/zh/remotes">分享与更新项目</a></h3>
<h3><a href="{{ site.baseurl }}/zh/remotes">分享与更新项目</a></h3>
<ul>
<li><a href="/zh/remotes/#fetch">fetch, pull</a></li>
<li><a href="/zh/remotes/#push">push</a></li>
<li><a href="/zh/remotes/#remote">remote</a></li>
<li><a href="{{ site.baseurl }}/zh/remotes/#fetch">fetch, pull</a></li>
<li><a href="{{ site.baseurl }}/zh/remotes/#push">push</a></li>
<li><a href="{{ site.baseurl }}/zh/remotes/#remote">remote</a></li>
</ul>
</div>

<div class="block">
<h3><a href="/zh/inspect">检查与比较</a></h3>
<h3><a href="{{ site.baseurl }}/zh/inspect">检查与比较</a></h3>
<ul>
<li><a href="/zh/inspect/#log">log</a></li>
<li><a href="/zh/inspect/#diff">diff</a></li>
<li><a href="{{ site.baseurl }}/zh/inspect/#log">log</a></li>
<li><a href="{{ site.baseurl }}/zh/inspect/#diff">diff</a></li>
</ul>
</div>

<!--
<div class="block">
<h3><a href="/zh/fixing">Fixing and Changing History</a></h3>
<h3><a href="zh/fixing">Fixing and Changing History</a></h3>
<ul>
<li><a href="/zh/fixing/rebase.html">rebase</a></li>
<li><a href="/zh/fixing/revert.html">revert</a></li>
<li><a href="/zh/fixing/checkout.html">checkout</a></li>
<li><a href="/zh/fixing/reset.html">reset</a></li>
<li><a href="/zh/fixing/cherry-pick.html">cherry-pick</a></li>
<li><a href="zh/fixing/rebase.html">rebase</a></li>
<li><a href="zh/fixing/revert.html">revert</a></li>
<li><a href="zh/fixing/checkout.html">checkout</a></li>
<li><a href="zh/fixing/reset.html">reset</a></li>
<li><a href="zh/fixing/cherry-pick.html">cherry-pick</a></li>
</ul>
</div>
-->
Expand Down
5 changes: 2 additions & 3 deletions basic/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -730,7 +730,7 @@ <h4 id="reset-hard">
dangerous option and is not working directory safe. Any changes not committed will
be lost.
</p>

<pre>
<b>$ git status</b>
# On branch master
Expand Down Expand Up @@ -970,5 +970,4 @@ <h4 id="stash-drop">
</div>
</div>

<p><a class="page-button next-page" href="/branching">On to Branching and Merging &#187;</a></p>

<p><a class="page-button next-page" href="{{ site.baseurl }}/branching">On to Branching and Merging &#187;</a></p>
5 changes: 2 additions & 3 deletions branching/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ <h4 id="branch-last-commit">
<small>see the last commit on each branch</small>
</h4>

<p>If we want to see last commits on each branch
<p>If we want to see last commits on each branch
we can run <code>git branch -v</code> to see them.</p>

<pre>
Expand Down Expand Up @@ -860,5 +860,4 @@ <h2>
</div>
</div>

<p><a class="page-button next-page" href="/remotes">On to Sharing and Updating Projects &#187;</a></p>

<p><a class="page-button next-page" href="{{ site.baseurl }}/remotes">On to Sharing and Updating Projects &#187;</a></p>
4 changes: 2 additions & 2 deletions creating/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<h2>Getting and Creating Projects</h2>
<div class="block">
<p>
In order to do anything in Git, you have to have a Git repository. This
In order to do anything in Git, you need to have a Git repository. This
is where Git stores the data for the snapshots you are saving.
</p>

Expand Down Expand Up @@ -139,4 +139,4 @@ <h2>
</div>
</div>

<p><a class="page-button next-page" href="/basic">On to Basic Snapshotting &#187;</a></p>
<p><a class="page-button next-page" href="{{ site.baseurl }}/basic">On to Basic Snapshotting &#187;</a></p>
2 changes: 1 addition & 1 deletion index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,4 +109,4 @@ <h2>How to Think Like Git</h2>
</div>
</div>

<p><a class="page-button next-page" href="/creating">On to Getting and Creating Projects &#187;</a></p>
<p><a class="page-button next-page" href="{{ site.baseurl }}/creating">On to Getting and Creating Projects &#187;</a></p>
4 changes: 2 additions & 2 deletions remotes/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ <h4 id="remote-rename">
<small>rename remote aliases</small>
</h4>

<p>If you want to rename remote aliases without having to delete them and add them again
<p>If you want to rename remote aliases without having to delete them and add them again
you can do that by running <code>git remote rename [old-alias] [new-alias]</code>. This will
allow you to modify the current name of the remote.</p>

Expand Down Expand Up @@ -437,4 +437,4 @@ <h2>
</div>
</div>

<p><a class="page-button next-page" href="/inspect">On to Inspection and Comparison &#187;</a></p>
<p><a class="page-button next-page" href="{{ site.baseurl }}/inspect">On to Inspection and Comparison &#187;</a></p>
3 changes: 1 addition & 2 deletions zh/basic/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -641,5 +641,4 @@ <h4>
</div>
</div>

<p><a href="/zh/branching">到 分支与合并 &#187;</a></p>

<p><a href="{{ site.baseurl }}/zh/branching">到 分支与合并 &#187;</a></p>
3 changes: 1 addition & 2 deletions zh/branching/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -696,5 +696,4 @@ <h2>
</div>
</div>

<p><a href="/zh/remotes">到 分享与更新项目 &#187;</a></p>

<p><a href="{{ site.baseurl }}/zh/remotes">到 分享与更新项目 &#187;</a></p>
2 changes: 1 addition & 1 deletion zh/creating/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,4 +120,4 @@ <h2>
</div>
</div>

<p><a href="/zh/basic">接下来：基本快照 &#187;</a></p>
<p><a href="{{ site.baseurl }}/zh/basic">接下来：基本快照 &#187;</a></p>
2 changes: 1 addition & 1 deletion zh/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,4 +79,4 @@ <h2>如何以 Git 的方式思考</h2>
</div>
</div>

<p><a href="/zh/creating">接下来：获取与创建项目&#187;</a></p>
<p><a href="{{ site.baseurl }}/zh/creating">接下来：获取与创建项目&#187;</a></p>
4 changes: 2 additions & 2 deletions zh/remotes/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ <h2>
<div class="block">
<p>
Git 并不像 Subversion 那样有个中心服务器。
目前为止所有的命令都是本地执行的，更新的知识本地的数据库。
目前为止所有的命令都是本地执行的，更新的只是本地的数据库。
要通过 Git 与其他开发者合作，你需要将数据放到一台其他开发者能够连接的服务器上。
Git 实现此流程的方式是将你的数据与另一个仓库同步。在服务器与客户端之间并没有实质的区别 ——
Git 仓库就是 Git 仓库，你可以很容易地在两者之间同步。
Expand Down Expand Up @@ -318,4 +318,4 @@ <h2>
</div>
</div>

<p><a href="/zh/inspect">到 检查与比较&#187;</a></p>
<p><a href="{{ site.baseurl }}/zh/inspect">到 检查与比较&#187;</a></p>