From 0ad6f54db4a15c7bc2e6e3741d3e214ff5ab84a9 Mon Sep 17 00:00:00 2001 From: Brent Beer Date: Tue, 15 Aug 2017 11:38:47 +0200 Subject: [PATCH 1/7] turns out, this is all we need --- _config.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 _config.yml diff --git a/_config.yml b/_config.yml new file mode 100644 index 0000000..20f8676 --- /dev/null +++ b/_config.yml @@ -0,0 +1 @@ +baseurl: /git-reference From ad210d92df3b705e04c48bb4129bc7d623659578 Mon Sep 17 00:00:00 2001 From: Brent Beer Date: Tue, 15 Aug 2017 11:39:49 +0200 Subject: [PATCH 2/7] appending this to the layout for the entire site makes the assets load correctly now, yayyyyyy --- _layouts/reference.html | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/_layouts/reference.html b/_layouts/reference.html index 7240eba..4789ce5 100755 --- a/_layouts/reference.html +++ b/_layouts/reference.html @@ -3,16 +3,16 @@ Git Reference - - - - - - - - - - + + + + + + + + + +
From 5627497ee401b6416635c15f01e7d2839f909fd4 Mon Sep 17 00:00:00 2001 From: Brent Beer Date: Tue, 15 Aug 2017 11:41:03 +0200 Subject: [PATCH 3/7] add site.baseurl to next button at bottom of each page. --- basic/index.html | 5 ++--- branching/index.html | 5 ++--- creating/index.html | 2 +- index.html | 2 +- remotes/index.html | 4 ++-- zh/basic/index.html | 3 +-- zh/branching/index.html | 3 +-- zh/creating/index.html | 2 +- zh/remotes/index.html | 2 +- 9 files changed, 12 insertions(+), 16 deletions(-) diff --git a/basic/index.html b/basic/index.html index acdb606..9e1dac8 100644 --- a/basic/index.html +++ b/basic/index.html @@ -730,7 +730,7 @@

dangerous option and is not working directory safe. Any changes not committed will be lost.

- + 
 $ git status
 # On branch master
@@ -970,5 +970,4 @@

-

On to Branching and Merging »

- +

On to Branching and Merging »

diff --git a/branching/index.html b/branching/index.html index 96112be..bfe9530 100644 --- a/branching/index.html +++ b/branching/index.html @@ -150,7 +150,7 @@

see the last commit on each branch

-

If we want to see last commits on each branch +

If we want to see last commits on each branch we can run git branch -v to see them.

@@ -860,5 +860,4 @@ 

   
 
 
-
On to Sharing and Updating Projects »

-
+
On to Sharing and Updating Projects »

diff --git a/creating/index.html b/creating/index.html
index dc49109..29d2dea 100644
--- a/creating/index.html
+++ b/creating/index.html
@@ -139,4 +139,4 @@ 

   
 
 
-
On to Basic Snapshotting »

+
On to Basic Snapshotting »

diff --git a/index.html b/index.html
index a33d1d0..513e968 100644
--- a/index.html
+++ b/index.html
@@ -109,4 +109,4 @@ 
How to Think Like Git

   
 
 
-
On to Getting and Creating Projects »

+
On to Getting and Creating Projects »

diff --git a/remotes/index.html b/remotes/index.html
index 94df417..a4c7dfc 100644
--- a/remotes/index.html
+++ b/remotes/index.html
@@ -151,7 +151,7 @@ 

       rename remote aliases
     

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

 
@@ -437,4 +437,4 @@ 

   
 
 
-
On to Inspection and Comparison »

+
On to Inspection and Comparison »

diff --git a/zh/basic/index.html b/zh/basic/index.html
index e3ffd13..ecb2448 100644
--- a/zh/basic/index.html
+++ b/zh/basic/index.html
@@ -641,5 +641,4 @@ 

   
 
 
-
到 分支与合并 »

-
+
到 分支与合并 »

diff --git a/zh/branching/index.html b/zh/branching/index.html
index c706790..4b97584 100644
--- a/zh/branching/index.html
+++ b/zh/branching/index.html
@@ -696,5 +696,4 @@ 

   
 
 
-
到 分享与更新项目 »

-
+
到 分享与更新项目 »

diff --git a/zh/creating/index.html b/zh/creating/index.html
index 4ed22c2..0f4e05b 100644
--- a/zh/creating/index.html
+++ b/zh/creating/index.html
@@ -120,4 +120,4 @@ 

   
 
 
-
接下来：基本快照 »

+
接下来：基本快照 »

diff --git a/zh/remotes/index.html b/zh/remotes/index.html
index 20fba86..8489e12 100644
--- a/zh/remotes/index.html
+++ b/zh/remotes/index.html
@@ -318,4 +318,4 @@ 

   
 
 
-
到 检查与比较»

+
到 检查与比较»


From 9e06579fc2724b0f2df8dd10d4050fa78c2bb14b Mon Sep 17 00:00:00 2001
From: Brent Beer 
Date: Tue, 15 Aug 2017 11:42:36 +0200
Subject: [PATCH 4/7] forgot to add proper baseurl for zh layout

---
 _layouts/zh_reference.html | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/_layouts/zh_reference.html b/_layouts/zh_reference.html
index 02c8993..32c05c1 100755
--- a/_layouts/zh_reference.html
+++ b/_layouts/zh_reference.html
@@ -3,16 +3,16 @@
 	
 		
 		Git 参考手册
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
 	
 	
     


From 54e5202642f7b6a2c850d2e0f3a2069ea4c16ffe Mon Sep 17 00:00:00 2001
From: Brent Beer 
Date: Tue, 15 Aug 2017 11:47:00 +0200
Subject: [PATCH 5/7] site.baseurl for all links on side nav

---
 _layouts/reference.html | 52 ++++++++++++++++++++---------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/_layouts/reference.html b/_layouts/reference.html
index 4789ce5..78d8cd6 100755
--- a/_layouts/reference.html
+++ b/_layouts/reference.html
@@ -23,9 +23,9 @@
 
 			

 				
@@ -35,51 +35,51 @@
 
 			

           

-            
Getting and Creating Projects

+            
Getting and Creating Projects

             
 					

 
           

-            
Basic Snapshotting

+            
Basic Snapshotting

             
           

 
           

-            
Branching and Merging

+            
Branching and Merging

             
           

 
           

-            
Sharing and Updating Projects

+            
Sharing and Updating Projects

             
           

 
           

-            
Inspection and Comparison

+            
Inspection and Comparison

             
           

 

From 158ac05e4b4034b84fb1244d2c6ff9898e85baf5 Mon Sep 17 00:00:00 2001
From: Brent Beer 
Date: Thu, 24 Aug 2017 16:44:45 -0500
Subject: [PATCH 6/7] missed one link missing baseurl on home page

---
 zh/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zh/index.html b/zh/index.html
index 4a74633..2c45e46 100644
--- a/zh/index.html
+++ b/zh/index.html
@@ -79,4 +79,4 @@ 
如何以 Git 的方式思考

   

 

 
-
接下来：获取与创建项目»

+
接下来：获取与创建项目»


From 89872fb8651743a3774fe5e10074a5f97fdd4571 Mon Sep 17 00:00:00 2001
From: Brent Beer 
Date: Thu, 24 Aug 2017 16:47:18 -0500
Subject: [PATCH 7/7] update zh_reference with baseurl liquid tag

---
 _layouts/zh_reference.html | 50 +++++++++++++++++++-------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/_layouts/zh_reference.html b/_layouts/zh_reference.html
index 32c05c1..333d225 100755
--- a/_layouts/zh_reference.html
+++ b/_layouts/zh_reference.html
@@ -23,9 +23,9 @@
 
 			

 				
@@ -35,50 +35,50 @@