From ec2d10723ecd0be878b9a12f65ca68a63f683706 Mon Sep 17 00:00:00 2001
From: jack <1395093509@qq.com>
Date: Sun, 26 Aug 2018 16:01:47 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test.md | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 test.md

diff --git a/test.md b/test.md
new file mode 100644
index 0000000..0daa2fc
--- /dev/null
+++ b/test.md
@@ -0,0 +1,3 @@
+# 测试git
+
+- 新增更新，测试合并 merge --no-ff

From 89f3093edaae4f1861b082db7679ec1494f0f40c Mon Sep 17 00:00:00 2001
From: jack <1395093509@qq.com>
Date: Sun, 26 Aug 2018 16:04:55 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81--no-?=
 =?UTF-8?q?ff?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test.md b/test.md
index 0daa2fc..305937f 100644
--- a/test.md
+++ b/test.md
@@ -1,3 +1,4 @@
 # 测试git
 
-- 新增更新，测试合并 merge --no-ff
+- 新增更新，测试合并
+- 合并代码使用 merge --no-ff

From 2ab3b5d99cd02da53051262ee101e54f58cd58da Mon Sep 17 00:00:00 2001
From: jack <1395093509@qq.com>
Date: Sun, 26 Aug 2018 20:28:11 +0800
Subject: [PATCH 03/10] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test.md | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 test.md

diff --git a/test.md b/test.md
deleted file mode 100644
index 305937f..0000000
--- a/test.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# 测试git
-
-- 新增更新，测试合并
-- 合并代码使用 merge --no-ff

From 975358c06c007d6fda320ef3241ed6b005ddde5d Mon Sep 17 00:00:00 2001
From: jack <1395093509@qq.com>
Date: Sun, 26 Aug 2018 20:28:56 +0800
Subject: [PATCH 04/10] add test.md

---
 test.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 test.md

diff --git a/test.md b/test.md
new file mode 100644
index 0000000..e0e687d
--- /dev/null
+++ b/test.md
@@ -0,0 +1,5 @@
+# 测试git
+
+- 新增更新，测试合并
+- 合并代码使用 merge --no-ff
+- 测试代码撤销

From ce93071bd2d9308e179bac558c311db47b1f98c8 Mon Sep 17 00:00:00 2001
From: jack <1395093509@qq.com>
Date: Sun, 26 Aug 2018 20:29:36 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E6=92=A4=E9=94=80=EF=BC=8C=E4=BF=AE=E6=94=B9commit=20message?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test.md b/test.md
index e0e687d..54699fd 100644
--- a/test.md
+++ b/test.md
@@ -3,3 +3,4 @@
 - 新增更新，测试合并
 - 合并代码使用 merge --no-ff
 - 测试代码撤销
+- 继续测试代码撤销

From 418bb46eaf7c2923ff8973f0dd035c06c8d1d360 Mon Sep 17 00:00:00 2001
From: jack <1395093509@qq.com>
Date: Sun, 26 Aug 2018 20:37:48 +0800
Subject: [PATCH 06/10] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=92=A4=E9=94=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test.md b/test.md
index 54699fd..88b12f5 100644
--- a/test.md
+++ b/test.md
@@ -4,3 +4,4 @@
 - 合并代码使用 merge --no-ff
 - 测试代码撤销
 - 继续测试代码撤销
+- 继续测试

From 95b06c22fb450f933752a8b0e7bd3ded15015511 Mon Sep 17 00:00:00 2001
From: jack <1395093509@qq.com>
Date: Sun, 26 Aug 2018 20:44:21 +0800
Subject: [PATCH 07/10] git reset HEAD~2

---
 test.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test.md b/test.md
index e0e687d..88b12f5 100644
--- a/test.md
+++ b/test.md
@@ -3,3 +3,5 @@
 - 新增更新，测试合并
 - 合并代码使用 merge --no-ff
 - 测试代码撤销
+- 继续测试代码撤销
+- 继续测试

From 8f9d5f13d91ffc9bc53116af5417bb1363855708 Mon Sep 17 00:00:00 2001
From: jack <1395093509@qq.com>
Date: Sun, 26 Aug 2018 20:50:36 +0800
Subject: [PATCH 08/10] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=92=A4=E9=94=802?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test.md b/test.md
index 88b12f5..07b9148 100644
--- a/test.md
+++ b/test.md
@@ -5,3 +5,4 @@
 - 测试代码撤销
 - 继续测试代码撤销
 - 继续测试
+- 测试撤销2

From a2393860913140ea95e6bc74985ce2b795822fb9 Mon Sep 17 00:00:00 2001
From: jack <1395093509@qq.com>
Date: Tue, 28 Aug 2018 11:43:55 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=E6=B5=8B=E8=AF=95=20sourceTree?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test.md b/test.md
index 07b9148..1f7815c 100644
--- a/test.md
+++ b/test.md
@@ -6,3 +6,4 @@
 - 继续测试代码撤销
 - 继续测试
 - 测试撤销2
+- test Sourcetree

From 1a3211308aa3eb7d61382c98566e6c0f6ce341d2 Mon Sep 17 00:00:00 2001
From: jack <1395093509@qq.com>
Date: Tue, 28 Aug 2018 17:14:45 +0800
Subject: [PATCH 10/10] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=BF=87=E6=BB=A4?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..8f02e89
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+test/
+node_modules/