From 1e2af024fe577e997d2bf7a38e3f190f4991b884 Mon Sep 17 00:00:00 2001 From: Milind Joshi Date: Fri, 22 Aug 2014 18:08:46 +0530 Subject: [PATCH 01/19] Create another-file --- another-file | 1 + 1 file changed, 1 insertion(+) create mode 100644 another-file diff --git a/another-file b/another-file new file mode 100644 index 00000000..ef934c58 --- /dev/null +++ b/another-file @@ -0,0 +1 @@ +This file was created after the repo was forked. From fabac0ce19f80578a941f210c2f982a6c2a63606 Mon Sep 17 00:00:00 2001 From: Brent Beer Date: Mon, 3 Apr 2017 18:52:16 +0200 Subject: [PATCH 02/19] Create first-file.md --- first-file.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 first-file.md diff --git a/first-file.md b/first-file.md new file mode 100644 index 00000000..ad1d648d --- /dev/null +++ b/first-file.md @@ -0,0 +1 @@ +This is the content for my first file. From 688cb79cd7d530e092b6c97e1e463c8550db4bd0 Mon Sep 17 00:00:00 2001 From: xiegithub <541534530@qq.com> Date: Sun, 15 Oct 2017 12:49:19 +0800 Subject: [PATCH 03/19] Create lesson_one --- lesson_one | 1 + 1 file changed, 1 insertion(+) create mode 100644 lesson_one diff --git a/lesson_one b/lesson_one new file mode 100644 index 00000000..21f066f9 --- /dev/null +++ b/lesson_one @@ -0,0 +1 @@ +lesson one From 090da45a750a0122a6e183de0e90285abb9b0c26 Mon Sep 17 00:00:00 2001 From: xiegithub <541534530@qq.com> Date: Sun, 15 Oct 2017 13:41:53 +0800 Subject: [PATCH 04/19] Update README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index efebf033..a47154e9 100644 --- a/README.md +++ b/README.md @@ -7,3 +7,7 @@ How to Contribute ================= Just fork the original repo at pragmaticlearning/github-example, make your changes and send over a Pull Request. + +lesson one +================= +xiegithub From b608e40446709540fcf4a33183dce845a4fd0821 Mon Sep 17 00:00:00 2001 From: xiegithub <541534530@qq.com> Date: Sun, 15 Oct 2017 13:49:14 +0800 Subject: [PATCH 05/19] Rename lesson_one to document/chapter_1 --- lesson_one => document/chapter_1 | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename lesson_one => document/chapter_1 (100%) diff --git a/lesson_one b/document/chapter_1 similarity index 100% rename from lesson_one rename to document/chapter_1 From 474e1b065563ac4c6cba6b5a0d5d75a35d5604f8 Mon Sep 17 00:00:00 2001 From: xiegithub <541534530@qq.com> Date: Sun, 15 Oct 2017 13:55:49 +0800 Subject: [PATCH 06/19] Rename document/chapter_1 to new_docs/chapter --- document/chapter_1 => new_docs/chapter | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename document/chapter_1 => new_docs/chapter (100%) diff --git a/document/chapter_1 b/new_docs/chapter similarity index 100% rename from document/chapter_1 rename to new_docs/chapter From 0cf67952eb3381828a19a335c87658477b90682e Mon Sep 17 00:00:00 2001 From: xiegithub <541534530@qq.com> Date: Sun, 15 Oct 2017 13:59:33 +0800 Subject: [PATCH 07/19] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index a47154e9..88d27aec 100644 --- a/README.md +++ b/README.md @@ -11,3 +11,5 @@ Just fork the original repo at pragmaticlearning/github-example, make your chang lesson one ================= xiegithub + +edit again From 98a707f7e54affb72fed3f13f92a85aafa87ef95 Mon Sep 17 00:00:00 2001 From: "541534530@qq.com" <541534530@qq.com> Date: Mon, 16 Sep 2019 15:00:56 +0800 Subject: [PATCH 08/19] server commit 1 Signed-off-by: 541534530@qq.com <541534530@qq.com> --- new_docs/chapter | 1 + new_docs/server.txt | 1 + 2 files changed, 2 insertions(+) create mode 100644 new_docs/server.txt diff --git a/new_docs/chapter b/new_docs/chapter index 21f066f9..5e781a1d 100644 --- a/new_docs/chapter +++ b/new_docs/chapter @@ -1 +1,2 @@ lesson one +server commit 1 diff --git a/new_docs/server.txt b/new_docs/server.txt new file mode 100644 index 00000000..9fb32614 --- /dev/null +++ b/new_docs/server.txt @@ -0,0 +1 @@ +server commit 1 \ No newline at end of file From 8bba860a311b6b3af8352fe4b29a157f11efb1a4 Mon Sep 17 00:00:00 2001 From: "541534530@qq.com" <541534530@qq.com> Date: Mon, 16 Sep 2019 15:14:28 +0800 Subject: [PATCH 09/19] server commit 2 Signed-off-by: 541534530@qq.com <541534530@qq.com> --- new_docs/server.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/new_docs/server.txt b/new_docs/server.txt index 9fb32614..5a701c2f 100644 --- a/new_docs/server.txt +++ b/new_docs/server.txt @@ -1 +1,2 @@ -server commit 1 \ No newline at end of file +server commit 1 +server commit 2 \ No newline at end of file From c95a7f068f6a44d9ce2d53b2ed8b4644278647f9 Mon Sep 17 00:00:00 2001 From: "541534530@qq.com" <541534530@qq.com> Date: Mon, 16 Sep 2019 16:09:16 +0800 Subject: [PATCH 10/19] reset --- new_docs/chapter | 3 +-- new_docs/server.txt | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) delete mode 100644 new_docs/server.txt diff --git a/new_docs/chapter b/new_docs/chapter index 5e781a1d..f663d16d 100644 --- a/new_docs/chapter +++ b/new_docs/chapter @@ -1,2 +1 @@ -lesson one -server commit 1 +lesson master diff --git a/new_docs/server.txt b/new_docs/server.txt deleted file mode 100644 index 5a701c2f..00000000 --- a/new_docs/server.txt +++ /dev/null @@ -1,2 +0,0 @@ -server commit 1 -server commit 2 \ No newline at end of file From b48834449626543cf035363e1e873894828536ac Mon Sep 17 00:00:00 2001 From: "541534530@qq.com" <541534530@qq.com> Date: Mon, 16 Sep 2019 16:21:08 +0800 Subject: [PATCH 11/19] master-C4 commit 1 Signed-off-by: 541534530@qq.com <541534530@qq.com> --- new_docs/chapter | 3 ++- new_docs/master-C4.txt | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 new_docs/master-C4.txt diff --git a/new_docs/chapter b/new_docs/chapter index f663d16d..fbbed0e9 100644 --- a/new_docs/chapter +++ b/new_docs/chapter @@ -1 +1,2 @@ -lesson master +lesson master-C4 +master-C4 commit 1 diff --git a/new_docs/master-C4.txt b/new_docs/master-C4.txt new file mode 100644 index 00000000..f4ef1e58 --- /dev/null +++ b/new_docs/master-C4.txt @@ -0,0 +1 @@ +master-C4 commit 1 From 33291bc033539f8ea60efe1eae1a83aba238dd30 Mon Sep 17 00:00:00 2001 From: "541534530@qq.com" <541534530@qq.com> Date: Mon, 16 Sep 2019 16:22:45 +0800 Subject: [PATCH 12/19] master-C5 commit 1 Signed-off-by: 541534530@qq.com <541534530@qq.com> --- new_docs/chapter | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/new_docs/chapter b/new_docs/chapter index f663d16d..bbc15eb3 100644 --- a/new_docs/chapter +++ b/new_docs/chapter @@ -1 +1,2 @@ -lesson master +lesson master-C5 +master-C5 commit 1 From 6af5c4ea16d684c7abfc2eaa267e159e55d08f26 Mon Sep 17 00:00:00 2001 From: "541534530@qq.com" <541534530@qq.com> Date: Mon, 16 Sep 2019 16:23:49 +0800 Subject: [PATCH 13/19] master-C5 commit 1 --- new_docs/master-C5.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 new_docs/master-C5.txt diff --git a/new_docs/master-C5.txt b/new_docs/master-C5.txt new file mode 100644 index 00000000..28f3808a --- /dev/null +++ b/new_docs/master-C5.txt @@ -0,0 +1 @@ +master-C5 commit 1 From 306a198ae46187fe113e0daafbebce8a915375fd Mon Sep 17 00:00:00 2001 From: "541534530@qq.com" <541534530@qq.com> Date: Mon, 16 Sep 2019 17:48:27 +0800 Subject: [PATCH 14/19] rebase reset --- new_docs/chapter | 5 +---- new_docs/master-C4.txt | 1 - new_docs/master-C5.txt | 1 - 3 files changed, 1 insertion(+), 6 deletions(-) delete mode 100644 new_docs/master-C4.txt delete mode 100644 new_docs/master-C5.txt diff --git a/new_docs/chapter b/new_docs/chapter index 0f6dfec8..6b41e852 100644 --- a/new_docs/chapter +++ b/new_docs/chapter @@ -1,4 +1 @@ -lesson master-C5 -master-C5 commit 1 -lesson master-C4 -master-C4 commit 1 +lesson reset diff --git a/new_docs/master-C4.txt b/new_docs/master-C4.txt deleted file mode 100644 index f4ef1e58..00000000 --- a/new_docs/master-C4.txt +++ /dev/null @@ -1 +0,0 @@ -master-C4 commit 1 diff --git a/new_docs/master-C5.txt b/new_docs/master-C5.txt deleted file mode 100644 index 28f3808a..00000000 --- a/new_docs/master-C5.txt +++ /dev/null @@ -1 +0,0 @@ -master-C5 commit 1 From d23b7e3066d95e0e2d8e675a18e9eb0d5f30de5d Mon Sep 17 00:00:00 2001 From: "541534530@qq.com" <541534530@qq.com> Date: Tue, 17 Sep 2019 00:05:29 +0800 Subject: [PATCH 15/19] dev1 commit 1 --- new_docs/chapter | 1 + new_docs/dev1 | 1 + 2 files changed, 2 insertions(+) create mode 100644 new_docs/dev1 diff --git a/new_docs/chapter b/new_docs/chapter index 6b41e852..372091ed 100644 --- a/new_docs/chapter +++ b/new_docs/chapter @@ -1 +1,2 @@ lesson reset +dev1 commit 1 \ No newline at end of file diff --git a/new_docs/dev1 b/new_docs/dev1 new file mode 100644 index 00000000..c20ccab6 --- /dev/null +++ b/new_docs/dev1 @@ -0,0 +1 @@ +dev1 commit 1 From 3a12a1191449d4cd92e12d22559bd2c744fa520f Mon Sep 17 00:00:00 2001 From: "541534530@qq.com" <541534530@qq.com> Date: Tue, 17 Sep 2019 00:06:14 +0800 Subject: [PATCH 16/19] dev1 commit 2 --- new_docs/dev1 | 1 + 1 file changed, 1 insertion(+) diff --git a/new_docs/dev1 b/new_docs/dev1 index c20ccab6..fcbb8a1f 100644 --- a/new_docs/dev1 +++ b/new_docs/dev1 @@ -1 +1,2 @@ dev1 commit 1 +dev1 commit 2 From 8e82123f9179ddb671511f0e8f55a2caf4775d21 Mon Sep 17 00:00:00 2001 From: "541534530@qq.com" <541534530@qq.com> Date: Tue, 17 Sep 2019 09:46:18 +0800 Subject: [PATCH 17/19] reset --- new_docs/chapter | 1 - new_docs/dev1 | 2 -- 2 files changed, 3 deletions(-) delete mode 100644 new_docs/dev1 diff --git a/new_docs/chapter b/new_docs/chapter index 372091ed..6b41e852 100644 --- a/new_docs/chapter +++ b/new_docs/chapter @@ -1,2 +1 @@ lesson reset -dev1 commit 1 \ No newline at end of file diff --git a/new_docs/dev1 b/new_docs/dev1 deleted file mode 100644 index fcbb8a1f..00000000 --- a/new_docs/dev1 +++ /dev/null @@ -1,2 +0,0 @@ -dev1 commit 1 -dev1 commit 2 From db236ebe15c96792cf0557a11d3e7dd8277f3c56 Mon Sep 17 00:00:00 2001 From: "541534530@qq.com" <541534530@qq.com> Date: Tue, 17 Sep 2019 09:49:36 +0800 Subject: [PATCH 18/19] dev2 commit 1 --- new_docs/chapter | 1 + new_docs/dev2 | 1 + 2 files changed, 2 insertions(+) create mode 100644 new_docs/dev2 diff --git a/new_docs/chapter b/new_docs/chapter index 6b41e852..d63be752 100644 --- a/new_docs/chapter +++ b/new_docs/chapter @@ -1 +1,2 @@ lesson reset +dev2 commit 1 diff --git a/new_docs/dev2 b/new_docs/dev2 new file mode 100644 index 00000000..303c17b1 --- /dev/null +++ b/new_docs/dev2 @@ -0,0 +1 @@ +dev2 commit 1 From 188244fb3accd9fa39d7ac23fade16faec7e90ab Mon Sep 17 00:00:00 2001 From: "541534530@qq.com" <541534530@qq.com> Date: Tue, 17 Sep 2019 09:49:55 +0800 Subject: [PATCH 19/19] dev2 commit 2 --- new_docs/dev2 | 1 + 1 file changed, 1 insertion(+) diff --git a/new_docs/dev2 b/new_docs/dev2 index 303c17b1..f8a15d57 100644 --- a/new_docs/dev2 +++ b/new_docs/dev2 @@ -1 +1,2 @@ dev2 commit 1 +dev2 commit 2