From a02a5d4654d53d3551dfe8a876b067753056758d Mon Sep 17 00:00:00 2001 From: Syskey Date: 2018年9月30日 14:09:36 +0800 Subject: [PATCH 01/10] wrote a readme file --- readme.txt | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 readme.txt diff --git a/readme.txt b/readme.txt new file mode 100644 index 0000000..0065b6f --- /dev/null +++ b/readme.txt @@ -0,0 +1,2 @@ +Git is a version control system. +Git is a free software. \ No newline at end of file From 5652cbe11d173983adff004981d01d06c792ecac Mon Sep 17 00:00:00 2001 From: Syskey Date: 2018年9月30日 16:34:10 +0800 Subject: [PATCH 02/10] add distributed --- readme.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/readme.txt b/readme.txt index 0065b6f..5367626 100644 --- a/readme.txt +++ b/readme.txt @@ -1,2 +1,2 @@ -Git is a version control system. -Git is a free software. \ No newline at end of file +Git is a distributed version control system. +Git is a free software. From 77db6b3bc0e60dc84c1fb7ab4da72fbb03c9c86e Mon Sep 17 00:00:00 2001 From: Syskey Date: Mon, 1 Oct 2018 12:19:52 +0800 Subject: [PATCH 03/10] understand how stage works --- LICENSE | 0 readme.txt | 1 + 2 files changed, 1 insertion(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..e69de29 diff --git a/readme.txt b/readme.txt index 5367626..6022568 100644 --- a/readme.txt +++ b/readme.txt @@ -1,2 +1,3 @@ Git is a distributed version control system. Git is a free software. +Git has a mutable index called stage. From b8fb5db05596ca3d43b2a9a2514ddc6c7aa66af9 Mon Sep 17 00:00:00 2001 From: Syskey Date: Mon, 1 Oct 2018 12:22:17 +0800 Subject: [PATCH 04/10] git tracks changes --- readme.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/readme.txt b/readme.txt index 6022568..a86c8ee 100644 --- a/readme.txt +++ b/readme.txt @@ -1,3 +1,4 @@ Git is a distributed version control system. Git is a free software. Git has a mutable index called stage. +Git tracks changes. From ad965e2745748e0c8968ffabc0738cb4bcf720e1 Mon Sep 17 00:00:00 2001 From: Syskey Date: Mon, 1 Oct 2018 15:37:27 +0800 Subject: [PATCH 05/10] add test.txt --- test.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 test.txt diff --git a/test.txt b/test.txt new file mode 100644 index 0000000..e69de29 From 50d95d2e4d134ea34bdc7953c58d15245ffe0cc1 Mon Sep 17 00:00:00 2001 From: Syskey Date: Mon, 1 Oct 2018 15:39:43 +0800 Subject: [PATCH 06/10] remove test.txt --- test.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 test.txt diff --git a/test.txt b/test.txt deleted file mode 100644 index e69de29..0000000 From d795fbff207d4362714deb7ab57197b246d3f9f3 Mon Sep 17 00:00:00 2001 From: Syskey Date: Tue, 2 Oct 2018 11:22:31 +0800 Subject: [PATCH 07/10] add merge --- readme.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/readme.txt b/readme.txt index a86c8ee..341549a 100644 --- a/readme.txt +++ b/readme.txt @@ -2,3 +2,4 @@ Git is a distributed version control system. Git is a free software. Git has a mutable index called stage. Git tracks changes. +Git add merge. From 518c3918adc33b928098807454af44af1be3d93a Mon Sep 17 00:00:00 2001 From: Syskey Date: Tue, 2 Oct 2018 16:15:01 +0800 Subject: [PATCH 08/10] add env --- env.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 env.txt diff --git a/env.txt b/env.txt new file mode 100644 index 0000000..9794f45 --- /dev/null +++ b/env.txt @@ -0,0 +1 @@ +Env From 32b4a1604e5ce4b5e98cea9e5e9c79fe38139b0a Mon Sep 17 00:00:00 2001 From: Syskey Date: Tue, 2 Oct 2018 16:38:50 +0800 Subject: [PATCH 09/10] add env --- env.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 env.txt diff --git a/env.txt b/env.txt new file mode 100644 index 0000000..3f5ff8d --- /dev/null +++ b/env.txt @@ -0,0 +1 @@ +New env From 40ba6d4e8c62931f67d2f4945e8c4bd481e3ca13 Mon Sep 17 00:00:00 2001 From: Syskey Date: Tue, 2 Oct 2018 16:53:15 +0800 Subject: [PATCH 10/10] fix conflict --- env.txt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/env.txt b/env.txt index b24e670..8e36d5b 100644 --- a/env.txt +++ b/env.txt @@ -1,5 +1,2 @@ -<<<<<<< HEAD +Fix conflict New env -======= -Env ->>>>>>> 518c3918adc33b928098807454af44af1be3d93a

AltStyle によって変換されたページ (->オリジナル) /