From d49ee9d9b1a4aadbb8f1fabb7068ef23dcc14ede Mon Sep 17 00:00:00 2001 From: gagarin525125 Date: Wed, 22 May 2019 15:01:58 +0200 Subject: [PATCH 01/47] My first commit --- hipster.txt | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 hipster.txt diff --git a/hipster.txt b/hipster.txt new file mode 100644 index 0000000..e54b9ec --- /dev/null +++ b/hipster.txt @@ -0,0 +1,9 @@ +Lorem ipsum dolor amet laborum tumeric selfies enim officia dolor flexitarian vinyl leggings. Before they sold out dolor adipisicing raw denim, cliche sriracha retro nostrud pinterest selvage +1. You probably haven't heard of them cillum salvia, etsy skateboard drinking vinegar aliqua dreamcatcher blue bottle eiusmod small batch poke. Waistcoat godard ugh vice ad butcher twee cupidatat umami everyday carry listicle voluptate. IPhone selvage irure church-key DIY blog. Enamel pin ut sustainable locavore schlitz excepteur. + +Seitan iceland fam kinfolk mumblecore. Fashion axe hella man bun cardigan fingerstache reprehenderit flannel mollit snackwave. Woke irony activated charcoal, celiac chicharrones aesthetic direct trade aute paleo hot chicken incididunt fixie post-ironic. Scenester quinoa marfa 8-bit eiusmod jean shorts, meh vexillologist cred dolore organic. Master cleanse fanny pack hot chicken everyday carry. Cliche voluptate vexillologist organic seitan iceland put a bird on it. + +Ut live-edge affogato art party organic, heirloom intelligentsia. Quinoa tote bag kombucha et, yuccie listicle forage duis pok pok keytar fixie cardigan. Letterpress pabst esse austin, slow-carb thundercats wayfarers. Bicycle rights truffaut nulla, ennui pariatur quis nostrud eiusmod master cleanse hexagon hashtag. + +Humblebrag butcher literally offal, aute adipisicing slow-carb pinterest culpa laboris twee elit eiusmod readymade voluptate. Deep v lumbersexual consectetur bicycle rights ea readymade laboris succulents typewriter commodo next level food truck coloring book minim. La croix pitchfork coloring book, activated charcoal asymmetrical next level voluptate pinterest et ipsum elit enim. Kickstarter microdosing pop-up proident organic trust fund twee vegan. Ugh commodo ea fingerstache laboris. + +Everyday carry pinterest iceland ullamco wolf scenester squid palo santo chillwave, fanny pack keffiyeh kombucha organic helvetica synth. Locavore cornhole twee, skateboard tofu velit salvia man braid pariatur four loko cliche try-hard master cleanse. Street art craft beer activated charcoal chartreuse stumptown, deserunt portland disrupt swag tattooed proident lyft snackwave VHS veniam. Hot chicken pok pok commodo, 90's before they sold out prism migas food truck listicle. Vexillologist iPhone selvage pop-up nulla umami authentic squid dreamcatcher. Intelligentsia cold-pressed sriracha gluten-free enim dolor lomo freegan ea neutra. \ No newline at end of file From 554d8a64d3460bf8cf33ea7d675db55d4c6305fd Mon Sep 17 00:00:00 2001 From: gagarin525125 Date: Wed, 22 May 2019 15:12:11 +0200 Subject: [PATCH 02/47] Adding more ipsum text --- hipster.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hipster.txt b/hipster.txt index e54b9ec..981ddf6 100644 --- a/hipster.txt +++ b/hipster.txt @@ -6,4 +6,5 @@ Ut live-edge affogato art party organic, heirloom intelligentsia. Quinoa tote ba Humblebrag butcher literally offal, aute adipisicing slow-carb pinterest culpa laboris twee elit eiusmod readymade voluptate. Deep v lumbersexual consectetur bicycle rights ea readymade laboris succulents typewriter commodo next level food truck coloring book minim. La croix pitchfork coloring book, activated charcoal asymmetrical next level voluptate pinterest et ipsum elit enim. Kickstarter microdosing pop-up proident organic trust fund twee vegan. Ugh commodo ea fingerstache laboris. -Everyday carry pinterest iceland ullamco wolf scenester squid palo santo chillwave, fanny pack keffiyeh kombucha organic helvetica synth. Locavore cornhole twee, skateboard tofu velit salvia man braid pariatur four loko cliche try-hard master cleanse. Street art craft beer activated charcoal chartreuse stumptown, deserunt portland disrupt swag tattooed proident lyft snackwave VHS veniam. Hot chicken pok pok commodo, 90's before they sold out prism migas food truck listicle. Vexillologist iPhone selvage pop-up nulla umami authentic squid dreamcatcher. Intelligentsia cold-pressed sriracha gluten-free enim dolor lomo freegan ea neutra. \ No newline at end of file +Everyday carry pinterest iceland ullamco wolf scenester squid palo santo chillwave, fanny pack keffiyeh kombucha organic helvetica synth. Locavore cornhole twee, skateboard tofu velit salvia man braid pariatur four loko cliche try-hard master cleanse. Street art craft beer activated charcoal chartreuse stumptown, deserunt portland disrupt swag tattooed proident lyft snackwave VHS veniam. Hot chicken pok pok commodo, 90's before they sold out prism migas food truck listicle. Vexillologist iPhone selvage pop-up nulla umami authentic squid dreamcatcher. Intelligentsia cold-pressed sriracha gluten-free enim dolor lomo freegan ea neutra. +Umami edison bulb freegan jianbing synth, shaman kickstarter put a bird on it tofu distillery aesthetic photo booth affogato church-key knausgaard. Vegan ugh fashion axe kickstarter whatever. Cloud bread before they sold out meggings hashtag palo santo cray XOXO selfies succulents tote bag. Humblebrag mustache ugh pitchfork tilde vexillologist disrupt hammock neutra kogi franzen. Gluten-free edison bulb vinyl selfies occupy ugh humblebrag. \ No newline at end of file From d68280189dae02910775f5b76a0d6c53c23c7b0d Mon Sep 17 00:00:00 2001 From: gagarin525125 Date: Wed, 22 May 2019 15:27:32 +0200 Subject: [PATCH 03/47] adding new file --- newfile.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 newfile.txt diff --git a/newfile.txt b/newfile.txt new file mode 100644 index 0000000..1271944 --- /dev/null +++ b/newfile.txt @@ -0,0 +1 @@ +new file \ No newline at end of file From b7fca98cad4d97ef1d2bbf4df2cce1e157c39c08 Mon Sep 17 00:00:00 2001 From: gagarin525125 Date: Wed, 22 May 2019 15:29:39 +0200 Subject: [PATCH 04/47] more ipsum for hipsters --- hipster.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hipster.txt b/hipster.txt index 981ddf6..928a201 100644 --- a/hipster.txt +++ b/hipster.txt @@ -7,4 +7,6 @@ Ut live-edge affogato art party organic, heirloom intelligentsia. Quinoa tote ba Humblebrag butcher literally offal, aute adipisicing slow-carb pinterest culpa laboris twee elit eiusmod readymade voluptate. Deep v lumbersexual consectetur bicycle rights ea readymade laboris succulents typewriter commodo next level food truck coloring book minim. La croix pitchfork coloring book, activated charcoal asymmetrical next level voluptate pinterest et ipsum elit enim. Kickstarter microdosing pop-up proident organic trust fund twee vegan. Ugh commodo ea fingerstache laboris. Everyday carry pinterest iceland ullamco wolf scenester squid palo santo chillwave, fanny pack keffiyeh kombucha organic helvetica synth. Locavore cornhole twee, skateboard tofu velit salvia man braid pariatur four loko cliche try-hard master cleanse. Street art craft beer activated charcoal chartreuse stumptown, deserunt portland disrupt swag tattooed proident lyft snackwave VHS veniam. Hot chicken pok pok commodo, 90's before they sold out prism migas food truck listicle. Vexillologist iPhone selvage pop-up nulla umami authentic squid dreamcatcher. Intelligentsia cold-pressed sriracha gluten-free enim dolor lomo freegan ea neutra. -Umami edison bulb freegan jianbing synth, shaman kickstarter put a bird on it tofu distillery aesthetic photo booth affogato church-key knausgaard. Vegan ugh fashion axe kickstarter whatever. Cloud bread before they sold out meggings hashtag palo santo cray XOXO selfies succulents tote bag. Humblebrag mustache ugh pitchfork tilde vexillologist disrupt hammock neutra kogi franzen. Gluten-free edison bulb vinyl selfies occupy ugh humblebrag. \ No newline at end of file +Umami edison bulb freegan jianbing synth, shaman kickstarter put a bird on it tofu distillery aesthetic photo booth affogato church-key knausgaard. Vegan ugh fashion axe kickstarter whatever. Cloud bread before they sold out meggings hashtag palo santo cray XOXO selfies succulents tote bag. Humblebrag mustache ugh pitchfork tilde vexillologist disrupt hammock neutra kogi franzen. Gluten-free edison bulb vinyl selfies occupy ugh humblebrag. +XOXO letterpress kitsch, vice church-key godard farm-to-table crucifix. Shaman tousled green juice pour-over organic paleo lumbersexual edison bulb pitchfork sriracha. Hell of cold-pressed meh gastropub, direct trade vice raclette tacos distillery fashion axe selvage trust fund chicharrones mustache. Organic hexagon vegan activated charcoal. +Hot chicken echo park organic, craft beer disrupt mustache artisan live-edge small batch listicle tumeric knausgaard wolf dreamcatcher. Green juice brunch VHS post-ironic flexitarian craft beer. Truffaut tote bag snackwave dreamcatcher, raclette stumptown lomo yuccie kombucha kogi salvia DIY tbh. Retro crucifix food truck echo park vaporware flexitarian. Pabst banh mi etsy butcher post-ironic messenger bag. From 4dc980680715d0ac4dd56910e79d020e1813aeb2 Mon Sep 17 00:00:00 2001 From: gagarin525125 Date: Wed, 22 May 2019 15:37:41 +0200 Subject: [PATCH 05/47] adding several files recursively --- level1/level1-file.txt | 1 + level1/level2/level2-file.txt | 1 + level1/level2/level3/level3-file.txt | 1 + level1/level2/level3/level4/level4-file.txt | 1 + 4 files changed, 4 insertions(+) create mode 100644 level1/level1-file.txt create mode 100644 level1/level2/level2-file.txt create mode 100644 level1/level2/level3/level3-file.txt create mode 100644 level1/level2/level3/level4/level4-file.txt diff --git a/level1/level1-file.txt b/level1/level1-file.txt new file mode 100644 index 0000000..8bcf063 --- /dev/null +++ b/level1/level1-file.txt @@ -0,0 +1 @@ +Freegan air plant YOLO, next level pitchfork copper mug listicle. Stumptown poutine butcher taiyaki lo-fi, pickled narwhal. Hoodie normcore vegan, migas mlkshk tbh taxidermy man bun enamel pin mumblecore biodiesel. Selfies prism pabst cliche wolf. \ No newline at end of file diff --git a/level1/level2/level2-file.txt b/level1/level2/level2-file.txt new file mode 100644 index 0000000..2951366 --- /dev/null +++ b/level1/level2/level2-file.txt @@ -0,0 +1 @@ +Aesthetic sunt vinyl pickled flexitarian tousled. Deserunt nulla chartreuse pok pok woke tote bag williamsburg. Selfies woke bicycle rights sartorial selvage magna flannel culpa chia taiyaki tumeric gastropub cliche typewriter biodiesel. Fingerstache vexillologist intelligentsia hell of. Hexagon letterpress cloud bread farm-to-table, 90's eiusmod PBR&B lo-fi in deep v succulents godard cronut. Fixie beard man braid single-origin coffee, id post-ironic velit tbh distillery dolore ethical. \ No newline at end of file diff --git a/level1/level2/level3/level3-file.txt b/level1/level2/level3/level3-file.txt new file mode 100644 index 0000000..c32c5a1 --- /dev/null +++ b/level1/level2/level3/level3-file.txt @@ -0,0 +1 @@ +Freegan eiusmod adipisicing skateboard. Blog plaid mollit schlitz kitsch raw denim dreamcatcher twee in crucifix. Pariatur truffaut normcore, mustache offal pickled farm-to-table echo park. Chartreuse pok pok hoodie franzen. Readymade PBR&B green juice echo park, ea aliquip raclette thundercats chia forage ex ut farm-to-table. \ No newline at end of file diff --git a/level1/level2/level3/level4/level4-file.txt b/level1/level2/level3/level4/level4-file.txt new file mode 100644 index 0000000..aaf98ef --- /dev/null +++ b/level1/level2/level3/level4/level4-file.txt @@ -0,0 +1 @@ +Oh. You need a little dummy text for your mockup? How quaint. \ No newline at end of file From 4bef319f9d172e795f9f33e84723b3413293684e Mon Sep 17 00:00:00 2001 From: gagarin525125 Date: Wed, 22 May 2019 15:45:38 +0200 Subject: [PATCH 06/47] renaming level 3 file --- level1/level2/level3/{level3-file.txt => level3.txt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename level1/level2/level3/{level3-file.txt => level3.txt} (100%) diff --git a/level1/level2/level3/level3-file.txt b/level1/level2/level3/level3.txt similarity index 100% rename from level1/level2/level3/level3-file.txt rename to level1/level2/level3/level3.txt From 5eb29514a7e33a8337cf192860a7f0871f23ff33 Mon Sep 17 00:00:00 2001 From: gagarin525125 Date: Wed, 22 May 2019 15:47:36 +0200 Subject: [PATCH 07/47] renaming level 2 file --- level1/level2/{level2-file.txt => level2.txt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename level1/level2/{level2-file.txt => level2.txt} (100%) diff --git a/level1/level2/level2-file.txt b/level1/level2/level2.txt similarity index 100% rename from level1/level2/level2-file.txt rename to level1/level2/level2.txt From 443468b1100876ef5f700a141136a3e6e72f6835 Mon Sep 17 00:00:00 2001 From: gagarin525125 Date: Wed, 22 May 2019 15:50:42 +0200 Subject: [PATCH 08/47] moving file from level 2 to level 3 --- level1/level2/{ => level3}/level2.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename level1/level2/{ => level3}/level2.txt (100%) diff --git a/level1/level2/level2.txt b/level1/level2/level3/level2.txt similarity index 100% rename from level1/level2/level2.txt rename to level1/level2/level3/level2.txt From eb56b6c1a746eed6d7d2568d401bb7686f5ea1ea Mon Sep 17 00:00:00 2001 From: gagarin525125 Date: Wed, 22 May 2019 15:52:24 +0200 Subject: [PATCH 09/47] moving level 2 file back to level 2 dir --- level1/level2/{level3 => }/level2.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename level1/level2/{level3 => }/level2.txt (100%) diff --git a/level1/level2/level3/level2.txt b/level1/level2/level2.txt similarity index 100% rename from level1/level2/level3/level2.txt rename to level1/level2/level2.txt From cca0288fb276bd49e5028f733acf9127dc03dc52 Mon Sep 17 00:00:00 2001 From: gagarin525125 Date: Wed, 22 May 2019 15:55:05 +0200 Subject: [PATCH 10/47] renaming level 1 file --- level1/{level1-file.txt => level1.txt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename level1/{level1-file.txt => level1.txt} (100%) diff --git a/level1/level1-file.txt b/level1/level1.txt similarity index 100% rename from level1/level1-file.txt rename to level1/level1.txt From 5fe15d969310fbb3b9ba3d069720c6a28f01263e Mon Sep 17 00:00:00 2001 From: gagarin525125 Date: Thu, 23 May 2019 09:15:04 +0200 Subject: [PATCH 11/47] Deleting newfile --- newfile.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 newfile.txt diff --git a/newfile.txt b/newfile.txt deleted file mode 100644 index 1271944..0000000 --- a/newfile.txt +++ /dev/null @@ -1 +0,0 @@ -new file \ No newline at end of file From f397a69b7c00a5666310c535856e1a1865b663ba Mon Sep 17 00:00:00 2001 From: gagarin525125 Date: Thu, 23 May 2019 09:24:04 +0200 Subject: [PATCH 12/47] Deleted hipster.txt --- hipster.txt | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 hipster.txt diff --git a/hipster.txt b/hipster.txt deleted file mode 100644 index 928a201..0000000 --- a/hipster.txt +++ /dev/null @@ -1,12 +0,0 @@ -Lorem ipsum dolor amet laborum tumeric selfies enim officia dolor flexitarian vinyl leggings. Before they sold out dolor adipisicing raw denim, cliche sriracha retro nostrud pinterest selvage +1. You probably haven't heard of them cillum salvia, etsy skateboard drinking vinegar aliqua dreamcatcher blue bottle eiusmod small batch poke. Waistcoat godard ugh vice ad butcher twee cupidatat umami everyday carry listicle voluptate. IPhone selvage irure church-key DIY blog. Enamel pin ut sustainable locavore schlitz excepteur. - -Seitan iceland fam kinfolk mumblecore. Fashion axe hella man bun cardigan fingerstache reprehenderit flannel mollit snackwave. Woke irony activated charcoal, celiac chicharrones aesthetic direct trade aute paleo hot chicken incididunt fixie post-ironic. Scenester quinoa marfa 8-bit eiusmod jean shorts, meh vexillologist cred dolore organic. Master cleanse fanny pack hot chicken everyday carry. Cliche voluptate vexillologist organic seitan iceland put a bird on it. - -Ut live-edge affogato art party organic, heirloom intelligentsia. Quinoa tote bag kombucha et, yuccie listicle forage duis pok pok keytar fixie cardigan. Letterpress pabst esse austin, slow-carb thundercats wayfarers. Bicycle rights truffaut nulla, ennui pariatur quis nostrud eiusmod master cleanse hexagon hashtag. - -Humblebrag butcher literally offal, aute adipisicing slow-carb pinterest culpa laboris twee elit eiusmod readymade voluptate. Deep v lumbersexual consectetur bicycle rights ea readymade laboris succulents typewriter commodo next level food truck coloring book minim. La croix pitchfork coloring book, activated charcoal asymmetrical next level voluptate pinterest et ipsum elit enim. Kickstarter microdosing pop-up proident organic trust fund twee vegan. Ugh commodo ea fingerstache laboris. - -Everyday carry pinterest iceland ullamco wolf scenester squid palo santo chillwave, fanny pack keffiyeh kombucha organic helvetica synth. Locavore cornhole twee, skateboard tofu velit salvia man braid pariatur four loko cliche try-hard master cleanse. Street art craft beer activated charcoal chartreuse stumptown, deserunt portland disrupt swag tattooed proident lyft snackwave VHS veniam. Hot chicken pok pok commodo, 90's before they sold out prism migas food truck listicle. Vexillologist iPhone selvage pop-up nulla umami authentic squid dreamcatcher. Intelligentsia cold-pressed sriracha gluten-free enim dolor lomo freegan ea neutra. -Umami edison bulb freegan jianbing synth, shaman kickstarter put a bird on it tofu distillery aesthetic photo booth affogato church-key knausgaard. Vegan ugh fashion axe kickstarter whatever. Cloud bread before they sold out meggings hashtag palo santo cray XOXO selfies succulents tote bag. Humblebrag mustache ugh pitchfork tilde vexillologist disrupt hammock neutra kogi franzen. Gluten-free edison bulb vinyl selfies occupy ugh humblebrag. -XOXO letterpress kitsch, vice church-key godard farm-to-table crucifix. Shaman tousled green juice pour-over organic paleo lumbersexual edison bulb pitchfork sriracha. Hell of cold-pressed meh gastropub, direct trade vice raclette tacos distillery fashion axe selvage trust fund chicharrones mustache. Organic hexagon vegan activated charcoal. -Hot chicken echo park organic, craft beer disrupt mustache artisan live-edge small batch listicle tumeric knausgaard wolf dreamcatcher. Green juice brunch VHS post-ironic flexitarian craft beer. Truffaut tote bag snackwave dreamcatcher, raclette stumptown lomo yuccie kombucha kogi salvia DIY tbh. Retro crucifix food truck echo park vaporware flexitarian. Pabst banh mi etsy butcher post-ironic messenger bag. From ae57955bb1819218bf18c26580db80428a8d0aca Mon Sep 17 00:00:00 2001 From: gagarin525125 Date: Thu, 23 May 2019 09:26:09 +0200 Subject: [PATCH 13/47] deleting level1 and all children --- level1/level1.txt | 1 - level1/level2/level2.txt | 1 - level1/level2/level3/level3.txt | 1 - level1/level2/level3/level4/level4-file.txt | 1 - 4 files changed, 4 deletions(-) delete mode 100644 level1/level1.txt delete mode 100644 level1/level2/level2.txt delete mode 100644 level1/level2/level3/level3.txt delete mode 100644 level1/level2/level3/level4/level4-file.txt diff --git a/level1/level1.txt b/level1/level1.txt deleted file mode 100644 index 8bcf063..0000000 --- a/level1/level1.txt +++ /dev/null @@ -1 +0,0 @@ -Freegan air plant YOLO, next level pitchfork copper mug listicle. Stumptown poutine butcher taiyaki lo-fi, pickled narwhal. Hoodie normcore vegan, migas mlkshk tbh taxidermy man bun enamel pin mumblecore biodiesel. Selfies prism pabst cliche wolf. \ No newline at end of file diff --git a/level1/level2/level2.txt b/level1/level2/level2.txt deleted file mode 100644 index 2951366..0000000 --- a/level1/level2/level2.txt +++ /dev/null @@ -1 +0,0 @@ -Aesthetic sunt vinyl pickled flexitarian tousled. Deserunt nulla chartreuse pok pok woke tote bag williamsburg. Selfies woke bicycle rights sartorial selvage magna flannel culpa chia taiyaki tumeric gastropub cliche typewriter biodiesel. Fingerstache vexillologist intelligentsia hell of. Hexagon letterpress cloud bread farm-to-table, 90's eiusmod PBR&B lo-fi in deep v succulents godard cronut. Fixie beard man braid single-origin coffee, id post-ironic velit tbh distillery dolore ethical. \ No newline at end of file diff --git a/level1/level2/level3/level3.txt b/level1/level2/level3/level3.txt deleted file mode 100644 index c32c5a1..0000000 --- a/level1/level2/level3/level3.txt +++ /dev/null @@ -1 +0,0 @@ -Freegan eiusmod adipisicing skateboard. Blog plaid mollit schlitz kitsch raw denim dreamcatcher twee in crucifix. Pariatur truffaut normcore, mustache offal pickled farm-to-table echo park. Chartreuse pok pok hoodie franzen. Readymade PBR&B green juice echo park, ea aliquip raclette thundercats chia forage ex ut farm-to-table. \ No newline at end of file diff --git a/level1/level2/level3/level4/level4-file.txt b/level1/level2/level3/level4/level4-file.txt deleted file mode 100644 index aaf98ef..0000000 --- a/level1/level2/level3/level4/level4-file.txt +++ /dev/null @@ -1 +0,0 @@ -Oh. You need a little dummy text for your mockup? How quaint. \ No newline at end of file From 4536c437edb3ae8895d153d38ae7d3721423961c Mon Sep 17 00:00:00 2001 From: gagarin525125 Date: Fri, 24 May 2019 08:35:26 +0200 Subject: [PATCH 14/47] Adding gitignore file to exclude unwanted files --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 5c91b60..2053ab3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ _site/ .sass-cache/ .jekyll-metadata +LICENCE \ No newline at end of file From 19fbdad2659fbac3526f9dc8a5788f1d6414e103 Mon Sep 17 00:00:00 2001 From: gagarin525125 Date: Fri, 24 May 2019 08:40:03 +0200 Subject: [PATCH 15/47] Excluding log file directory --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 2053ab3..f3eeee0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ _site/ .sass-cache/ .jekyll-metadata -LICENCE \ No newline at end of file +LICENCE +log/ \ No newline at end of file From 040be7b0ab4d271d0e068332e68afc5698b9596a Mon Sep 17 00:00:00 2001 From: gagarin525125 Date: Fri, 24 May 2019 14:07:33 +0200 Subject: [PATCH 16/47] Deleting README --- README.md | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 README.md diff --git a/README.md b/README.md deleted file mode 100644 index 03ff269..0000000 --- a/README.md +++ /dev/null @@ -1,2 +0,0 @@ -# scm-ninja.github.io -Trying out Pages From 4f9a87f83b32745553831a4fb4d8374af45583df Mon Sep 17 00:00:00 2001 From: gagarin525125 Date: Fri, 24 May 2019 14:17:20 +0200 Subject: [PATCH 17/47] Adding new Readme --- README.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..de5cc2f --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# STARTER WEB PROJECT + +## iNTRODUCTION \ No newline at end of file From 4342006247d4b6164da377ece6dd8b197ff03daf Mon Sep 17 00:00:00 2001 From: gagarin525125 Date: Fri, 24 May 2019 14:28:29 +0200 Subject: [PATCH 18/47] adding new section : Deployment --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index de5cc2f..a89417f 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ # STARTER WEB PROJECT -## iNTRODUCTION \ No newline at end of file +## iNTRODUCTION + +### deployment \ No newline at end of file From 9a1309aca0b2aef7cf851f85f565457bd8a356d6 Mon Sep 17 00:00:00 2001 From: gagarin525125 Date: Fri, 24 May 2019 14:30:23 +0200 Subject: [PATCH 19/47] Adding introduction text --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index a89417f..91eb627 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,7 @@ +modifieng file + # STARTER WEB PROJECT +second modification ## iNTRODUCTION From 02b417d164f64cbd79b4579d836a5e9e424d1e8a Mon Sep 17 00:00:00 2001 From: gagarin525125 Date: Mon, 27 May 2019 09:20:09 +0200 Subject: [PATCH 20/47] Add four pounds --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 91eb627..5d64719 100644 --- a/README.md +++ b/README.md @@ -4,5 +4,9 @@ modifieng file second modification ## iNTRODUCTION +another modification -### deployment \ No newline at end of file +### deployment + + +#### four pounds \ No newline at end of file From 4f9ebd2215cd07c4631e829910f2ca3bd0e14047 Mon Sep 17 00:00:00 2001 From: gagarin525125 Date: Mon, 27 May 2019 09:21:24 +0200 Subject: [PATCH 21/47] fifth --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 5d64719..8f1b6db 100644 --- a/README.md +++ b/README.md @@ -9,4 +9,6 @@ another modification ### deployment -#### four pounds \ No newline at end of file +#### four pounds + +###### pounds \ No newline at end of file From f152f67181a0125278223c798e675897452b6665 Mon Sep 17 00:00:00 2001 From: gagarin525125 Date: Mon, 27 May 2019 09:38:35 +0200 Subject: [PATCH 22/47] Add six --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 8f1b6db..1491c02 100644 --- a/README.md +++ b/README.md @@ -11,4 +11,8 @@ another modification #### four pounds -###### pounds \ No newline at end of file +###### pounds + + +###### + six pounds \ No newline at end of file From 34953c04c8e27f6ec36f34deab6a2e2b17daaaa1 Mon Sep 17 00:00:00 2001 From: gagarin525125 Date: Mon, 27 May 2019 10:02:59 +0200 Subject: [PATCH 23/47] updates repo --- README.md | 5 ++++- index.html | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1491c02..abdbbe2 100644 --- a/README.md +++ b/README.md @@ -15,4 +15,7 @@ another modification ###### - six pounds \ No newline at end of file + six pounds + +####### + sevenths \ No newline at end of file diff --git a/index.html b/index.html index 9ea9c85..bfa6678 100644 --- a/index.html +++ b/index.html @@ -2,7 +2,7 @@ - Scm-ninja.GitHub.io by scm-ninja + Simple title From cad87edc10bd3ef486bb196959c8b05f63e6aed7 Mon Sep 17 00:00:00 2001 From: gagarin525125 Date: Mon, 3 Jun 2019 09:42:56 +0200 Subject: [PATCH 24/47] new commit simple.html --- simple.html | 1 + 1 file changed, 1 insertion(+) create mode 100644 simple.html diff --git a/simple.html b/simple.html new file mode 100644 index 0000000..4896ae9 --- /dev/null +++ b/simple.html @@ -0,0 +1 @@ +:simple html file \ No newline at end of file From db2a1d0bc81c09730beaf2bdbef67bdb648a2af7 Mon Sep 17 00:00:00 2001 From: gagarin525125 Date: Mon, 3 Jun 2019 09:49:55 +0200 Subject: [PATCH 25/47] adding copyright notice --- simple.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/simple.html b/simple.html index 4896ae9..a5c119c 100644 --- a/simple.html +++ b/simple.html @@ -1 +1,2 @@ -:simple html file \ No newline at end of file +:simple html file +add copyright \ No newline at end of file From 4a8766943fb166eace69ac947caf35cf88770124 Mon Sep 17 00:00:00 2001 From: gagarin525125 Date: Mon, 3 Jun 2019 09:51:18 +0200 Subject: [PATCH 26/47] adding copyright notice to readme --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index abdbbe2..0a299dd 100644 --- a/README.md +++ b/README.md @@ -18,4 +18,7 @@ another modification six pounds ####### - sevenths \ No newline at end of file + sevenths + +### Copyright +Copyright notice \ No newline at end of file From 55c4ba78643dad8f218c79e7c2281dda3b85b03c Mon Sep 17 00:00:00 2001 From: gagarin525125 Date: Mon, 3 Jun 2019 09:59:46 +0200 Subject: [PATCH 27/47] adding team member to params --- params.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/params.json b/params.json index 39569dd..be8c120 100644 --- a/params.json +++ b/params.json @@ -3,4 +3,5 @@ "tagline": "Trying out Pages", "body": "# scm-ninja.github.io\r\nTrying out Pages\r\n", "note": "Don't delete this file! It's used internally to help with page regeneration." -} \ No newline at end of file +} +Jason Tailer \ No newline at end of file From 1b8edfd868a755eb59f1a6aee4b5be089f5ca477 Mon Sep 17 00:00:00 2001 From: gagarin525125 Date: Mon, 3 Jun 2019 10:01:12 +0200 Subject: [PATCH 28/47] adding instructions on how to contribute --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 0a299dd..120cb59 100644 --- a/README.md +++ b/README.md @@ -21,4 +21,7 @@ another modification sevenths ### Copyright -Copyright notice \ No newline at end of file +Copyright notice + +### How to Continue +fork \ No newline at end of file From 8df6bbcaa964760cb4174c261a95062eb098d3e0 Mon Sep 17 00:00:00 2001 From: gagarin525125 Date: Mon, 3 Jun 2019 10:07:09 +0200 Subject: [PATCH 29/47] changing params --- params.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/params.json b/params.json index be8c120..375592a 100644 --- a/params.json +++ b/params.json @@ -4,4 +4,7 @@ "body": "# scm-ninja.github.io\r\nTrying out Pages\r\n", "note": "Don't delete this file! It's used internally to help with page regeneration." } -Jason Tailer \ No newline at end of file +Jason Tailer +company name +dummy text +changing title \ No newline at end of file From d376847eb49f5a801ce4a58905d9f5e5ae065da5 Mon Sep 17 00:00:00 2001 From: gagarin525125 Date: Mon, 3 Jun 2019 10:08:40 +0200 Subject: [PATCH 30/47] adding confilct --- params.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/params.json b/params.json index be8c120..7e2de2c 100644 --- a/params.json +++ b/params.json @@ -4,4 +4,5 @@ "body": "# scm-ninja.github.io\r\nTrying out Pages\r\n", "note": "Don't delete this file! It's used internally to help with page regeneration." } -Jason Tailer \ No newline at end of file +Jason Tailer +Abraham Linkoln \ No newline at end of file From 86c583a18d95ac00ab20aced4ef7b76e9f75f247 Mon Sep 17 00:00:00 2001 From: gagarin525125 Date: Mon, 3 Jun 2019 10:18:34 +0200 Subject: [PATCH 31/47] updating ignore file to exclude merge temporary files --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index f3eeee0..24cc36d 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ _site/ .sass-cache/ .jekyll-metadata LICENCE -log/ \ No newline at end of file +log/ +*.orig \ No newline at end of file From 34034ba8d86babbe89ef84746ff7c4b88e74e45f Mon Sep 17 00:00:00 2001 From: gagarin525125 Date: Mon, 3 Jun 2019 10:20:25 +0200 Subject: [PATCH 32/47] .ignore --- .ignore | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 .ignore diff --git a/.ignore b/.ignore new file mode 100644 index 0000000..e69de29 From d1c5dfd4fc0af66e7d67feed3c2cbf8d5f082fa8 Mon Sep 17 00:00:00 2001 From: gagarin525125 Date: Tue, 4 Jun 2019 08:55:47 +0200 Subject: [PATCH 33/47] readme --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 120cb59..c33d5df 100644 --- a/README.md +++ b/README.md @@ -24,4 +24,7 @@ another modification Copyright notice ### How to Continue -fork \ No newline at end of file +fork + +## Add a line for rebase +add a line for rebase example \ No newline at end of file From 026817363a9dbf2e1d96a8a81e7f3b3402e8fe63 Mon Sep 17 00:00:00 2001 From: gagarin525125 Date: Tue, 4 Jun 2019 08:52:59 +0200 Subject: [PATCH 34/47] thanks to --- params.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/params.json b/params.json index 72e4868..c54899f 100644 --- a/params.json +++ b/params.json @@ -8,3 +8,6 @@ Jason Tailer company name dummy text changing title + + +all my students \ No newline at end of file From 2757696b964848fb685d1cc99a616c5d65e2c9a8 Mon Sep 17 00:00:00 2001 From: gagarin525125 Date: Tue, 4 Jun 2019 09:05:34 +0200 Subject: [PATCH 35/47] mb before rebase conflicts --- simple.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/simple.html b/simple.html index a5c119c..f2d44b9 100644 --- a/simple.html +++ b/simple.html @@ -1,2 +1,3 @@ :simple html file -add copyright \ No newline at end of file +add copyright +modification before rebase \ No newline at end of file From 4df1ddfceb7fafe1cb22d96cd408ea8e76eff77f Mon Sep 17 00:00:00 2001 From: gagarin525125 Date: Tue, 4 Jun 2019 09:07:59 +0200 Subject: [PATCH 36/47] mb conflicting changes brewing --- simple.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/simple.html b/simple.html index f2d44b9..85008ce 100644 --- a/simple.html +++ b/simple.html @@ -1,3 +1,5 @@ :simple html file add copyright -modification before rebase \ No newline at end of file +modification before rebase + +some conflicting changes \ No newline at end of file From 20b8dde07bc1f81f1164156fdafd7eb12215e35f Mon Sep 17 00:00:00 2001 From: gagarin525125 Date: Tue, 4 Jun 2019 09:07:03 +0200 Subject: [PATCH 37/47] fb adding some trouble to simple.html --- simple.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/simple.html b/simple.html index 85008ce..14116de 100644 --- a/simple.html +++ b/simple.html @@ -1,5 +1,4 @@ :simple html file add copyright modification before rebase - -some conflicting changes \ No newline at end of file +next change from bigtrouble From a34b5d75b6f9b1cd582a21ca2f0cdac0222fe40e Mon Sep 17 00:00:00 2001 From: gagarin525125 Date: Tue, 4 Jun 2019 09:13:37 +0200 Subject: [PATCH 38/47] adding changes --- simple.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/simple.html b/simple.html index 14116de..236c437 100644 --- a/simple.html +++ b/simple.html @@ -1,4 +1,5 @@ -:simple html file + add copyright +next change modification before rebase next change from bigtrouble From f5e17330b27c941cb6c7d14497081d37d2aab9d8 Mon Sep 17 00:00:00 2001 From: gagarin525125 Date: Tue, 4 Jun 2019 09:18:40 +0200 Subject: [PATCH 39/47] local: updating simple.html copyright notice --- simple.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/simple.html b/simple.html index 236c437..7e860b4 100644 --- a/simple.html +++ b/simple.html @@ -3,3 +3,6 @@ next change modification before rebase next change from bigtrouble + + +© 2019 Git.Training \ No newline at end of file From ca57e02084ff9049f769919ef0804a42d8016990 Mon Sep 17 00:00:00 2001 From: gagarin525125 Date: Tue, 4 Jun 2019 09:19:35 +0200 Subject: [PATCH 40/47] change from web --- simple.html | 1 + 1 file changed, 1 insertion(+) diff --git a/simple.html b/simple.html index 236c437..7316940 100644 --- a/simple.html +++ b/simple.html @@ -3,3 +3,4 @@ next change modification before rebase next change from bigtrouble +change from web From 17ce23b87d8a132cb33610121b81a8d8a7029041 Mon Sep 17 00:00:00 2001 From: gagarin525125 Date: Wed, 5 Jun 2019 09:02:18 +0200 Subject: [PATCH 41/47] change in readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c33d5df..8354d90 100644 --- a/README.md +++ b/README.md @@ -27,4 +27,4 @@ Copyright notice fork ## Add a line for rebase -add a line for rebase example \ No newline at end of file +add a line for rebase example All rights reserved \ No newline at end of file From ec36fdf6f34d0e6bb113b15e53df5765b9cf7014 Mon Sep 17 00:00:00 2001 From: gagarin525125 Date: Wed, 5 Jun 2019 09:03:58 +0200 Subject: [PATCH 42/47] done with simple.html updates --- simple.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/simple.html b/simple.html index 7e860b4..3958989 100644 --- a/simple.html +++ b/simple.html @@ -1,4 +1,5 @@ - +Change 1 +change 2 add copyright next change modification before rebase From 3e3ee21fdf90f9f0fa7019b8a47b3c0d73ab9861 Mon Sep 17 00:00:00 2001 From: gagarin525125 Date: Wed, 5 Jun 2019 09:13:59 +0200 Subject: [PATCH 43/47] after stash --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 8354d90..40e5e4e 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ +modification 1 modifieng file # STARTER WEB PROJECT From e028fa0b31c0ea3b1cb3f494dac31378c1030873 Mon Sep 17 00:00:00 2001 From: gagarin525125 Date: Wed, 5 Jun 2019 09:29:50 +0200 Subject: [PATCH 44/47] Changes after git stash command --- humans.txt | 2 ++ index.html | 2 +- simple.html | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 humans.txt diff --git a/humans.txt b/humans.txt new file mode 100644 index 0000000..ff31bd0 --- /dev/null +++ b/humans.txt @@ -0,0 +1,2 @@ +change 2 +change 1 \ No newline at end of file diff --git a/index.html b/index.html index bfa6678..720c612 100644 --- a/index.html +++ b/index.html @@ -2,7 +2,7 @@ - Simple title + adding title for stash example diff --git a/simple.html b/simple.html index e2d28ae..3727466 100644 --- a/simple.html +++ b/simple.html @@ -1,3 +1,4 @@ +Change 4 Change 1 change 2 add copyright From 8a7c8c6fcf0bd13cbe2b2b847331b4eedb152e7c Mon Sep 17 00:00:00 2001 From: gagarin525125 Date: Thu, 6 Jun 2019 09:07:36 +0200 Subject: [PATCH 45/47] Tweaking file for tagging --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 720c612..4475df3 100644 --- a/index.html +++ b/index.html @@ -2,7 +2,7 @@ - adding title for stash example + Tagging example From 0f33f02836d116d67884f222d26704bb8f66b21a Mon Sep 17 00:00:00 2001 From: gagarin525125 Date: Thu, 6 Jun 2019 09:10:16 +0200 Subject: [PATCH 46/47] updating for tag 1.2 --- simple.html | 1 + 1 file changed, 1 insertion(+) diff --git a/simple.html b/simple.html index 3727466..eaf5099 100644 --- a/simple.html +++ b/simple.html @@ -1,3 +1,4 @@ +Change 5 Change 4 Change 1 change 2 From 6dcd41cc67befe3be47a9ce71eed612881aec94f Mon Sep 17 00:00:00 2001 From: gagarin525125 Date: Fri, 7 Jun 2019 09:11:03 +0200 Subject: [PATCH 47/47] show diffs --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 40e5e4e..aed7bf1 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +changed to new branch + modification 1 modifieng file @@ -28,4 +30,4 @@ Copyright notice fork ## Add a line for rebase -add a line for rebase example All rights reserved \ No newline at end of file +add a line for rebase example All rights reserved