add opensource times

stormzhang · Jan 13, 2016 · 6f2f21d · 6f2f21d
1 parent 1a193a6
commit 6f2f21d
Show file tree

Hide file tree

Showing 15 changed files with 1,148 additions and 30 deletions.
diff --git a/LICENSE b/LICENSE
@@ -19,4 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-
diff --git a/assets/images/opensource-times/2b-pr.png b/assets/images/opensource-times/2b-pr.png
diff --git a/assets/images/opensource-times/babel.jpg b/assets/images/opensource-times/babel.jpg
diff --git a/assets/images/opensource-times/rails-releases.png b/assets/images/opensource-times/rails-releases.png
diff --git a/assets/images/opensource-times/react-modular-css.png b/assets/images/opensource-times/react-modular-css.png
diff --git a/assets/images/opensource-times/root-files.png b/assets/images/opensource-times/root-files.png
diff --git a/backbone-and-spa/index.html b/backbone-and-spa/index.html
@@ -4,7 +4,7 @@
 	<head>
 		<meta charset="utf-8">
 
-		<title>title</title>
+		<title>.&#x2F;backbone-and-spa.md</title>
 
 		<meta name="description" content="A framework for easily creating beautiful presentations using HTML">
 		<meta name="author" content="Hakim El Hattab">

diff --git a/git-a-trivial-matter/index.html b/git-a-trivial-matter/index.html
@@ -4,7 +4,7 @@
 	<head>
 		<meta charset="utf-8">
 
-		<title>title</title>
+		<title>.&#x2F;git-a-trivial-matter.md</title>
 
 		<meta name="description" content="A framework for easily creating beautiful presentations using HTML">
 		<meta name="author" content="Hakim El Hattab">
@@ -49,7 +49,7 @@
 -   git 时空穿越
 -   git 差异对比
 -   git 解决冲突
--   git 黑暗料理
+-   git 黑暗骑士
 -   git 好的提交
 -   git 拾遗
 </script></section><section  data-markdown><script type="text/template">
@@ -119,7 +119,7 @@
 
 不适合需要 code review 的情况
 </script></section><section data-markdown><script type="text/template">
-### sqush 合并
+### squash 合并
 
     git checkout master
     git merge dev --squash
@@ -261,14 +261,27 @@
 </script></section><section data-markdown><script type="text/template">
 ### 轻装上阵
 
-☁ /tmp git clone git@github.com:apiaryio/api-blueprint.git Cloning into
-'api-blueprint'... remote: Counting objects: 1497, done. ^CKilled^ by
-signal 2.4% (659/1497), 1.20 MiB | 29.00 KiB/s fatal: The remote end
-hung up unexpectedly
+    ☁ /tmp git clone git@github.com:apiaryio/api-blueprint.git Cloning into
+    'api-blueprint'... remote: Counting objects: 1497, done. ^CKilled^ by
+    signal 2.4% (659/1497), 1.20 MiB | 29.00 KiB/s fatal: The remote end
+    hung up unexpectedly
 
-☁ /tmp git clone --depth=1 git@github.com:apiaryio/api-blueprint.git
-Cloning into 'api-blueprint'... remote: Counting objects: 32, done.
-remote: Compressing objects: 100% (31/31), done.
+    ☁ /tmp git clone --depth=1 git@github.com:apiaryio/api-blueprint.git
+    Cloning into 'api-blueprint'... remote: Counting objects: 32, done.
+    remote: Compressing objects: 100% (31/31), done.
+
+如果事后先要拉取完整的历史记录
+
+    git pull --unshallow
+</script></section><section data-markdown><script type="text/template">
+### 乾坤大挪移
+
+使用情景: 在仓库A中, 我进行了一连串的 scaffold generation.
+然后发现进错项目了, 应该在仓库B中操作的.
+
+    ☁ /repo_a git diff > patch.txt
+    ☁ /repo_a mv patch.txt ../repo_b
+    ☁ /repo_b git apply patch.txt
 </script></section></section><section ><section data-markdown><script type="text/template">
 ## how to make good commit
 
@@ -334,14 +347,13 @@
 ### 代码风格
 
 <https://github.com/aseaday/git-style-guide>
-</script></section></section><section  data-markdown><script type="text/template">
-## worktree
+</script></section><section data-markdown><script type="text/template">
+### worktree
 
 分别管理 github-pages 和工作分支
 
     git worktree add -b gh-pages ../project-gh-pages origin/gh-pages
-
-</script></section><section  data-markdown><script type="text/template">
+</script></section></section><section  data-markdown><script type="text/template">
 ## Thanks
 
 Question?

diff --git a/index.html b/index.html
@@ -13,6 +13,7 @@
     <ul>
         <li><a href="./backbone-and-spa/">&#x2F;backbone-and-spa&#x2F;</a></li>
         <li><a href="./git-a-trivial-matter/">&#x2F;git-a-trivial-matter&#x2F;</a></li>
+        <li><a href="./opensource-times/">&#x2F;opensource-times&#x2F;</a></li>
         <li><a href="./rake-is-the-apple-of-my-eye/">&#x2F;rake-is-the-apple-of-my-eye&#x2F;</a></li>
         <li><a href="./talk-about-test/">&#x2F;talk-about-test&#x2F;</a></li>
         <li><a href="./">&#x2F;</a></li>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -19,4 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
		LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
		OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
		SOFTWARE.