From 704b8115e537f0a75b7396be864ec8c475c0053f Mon Sep 17 00:00:00 2001 From: Jeff Taggart Date: Thu, 12 Jun 2014 08:31:35 -0600 Subject: [PATCH 01/12] Added hello.txt --- hello.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 hello.txt diff --git a/hello.txt b/hello.txt new file mode 100644 index 0000000..e69de29 From 11f6f316e7f421e93e1bf176fd748f6403c1923d Mon Sep 17 00:00:00 2001 From: Jeff Taggart Date: Thu, 12 Jun 2014 08:32:30 -0600 Subject: [PATCH 02/12] Added line 1 to hello.txt --- hello.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/hello.txt b/hello.txt index e69de29..3b18e51 100644 --- a/hello.txt +++ b/hello.txt @@ -0,0 +1 @@ +hello world From 69fbea3eb218b9df666a148887324cd5bf0626f5 Mon Sep 17 00:00:00 2001 From: Jeff Taggart Date: Thu, 12 Jun 2014 08:33:19 -0600 Subject: [PATCH 03/12] Added git-log.txt --- git-log.txt | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100644 git-log.txt diff --git a/git-log.txt b/git-log.txt new file mode 100644 index 0000000..5980c15 --- /dev/null +++ b/git-log.txt @@ -0,0 +1,77 @@ +commit 11f6f316e7f421e93e1bf176fd748f6403c1923d +Author: Jeff Taggart +Date: Thu Jun 12 08:32:30 2014 -0600 + + Added line 1 to hello.txt + +commit 704b8115e537f0a75b7396be864ec8c475c0053f +Author: Jeff Taggart +Date: Thu Jun 12 08:31:35 2014 -0600 + + Added hello.txt + +commit 3bbc84e4e73090aecc45468aef492b8c8bbeceed +Author: Jeff Taggart +Date: Thu Jun 12 08:17:32 2014 -0600 + + Update README.md + +commit b3e6717dc4ad1cb86c93300729844e3abac19842 +Author: Jeff Taggart +Date: Thu Jun 12 08:17:01 2014 -0600 + + Update README.md + +commit 458daee29c49130eefb9117ac8ef304235bcffb9 +Author: Jeff Taggart +Date: Thu Jun 12 08:16:26 2014 -0600 + + Update README.md + +commit 0c4af531eb9510fc901be30fab40bc6cdfe51b9d +Author: Jeff Taggart +Date: Thu Jun 12 08:14:58 2014 -0600 + + Update README.md + +commit 33c30c3e132ab4db6baeac72d40469222ec622f9 +Author: Jeff Taggart +Date: Thu Jun 12 08:13:07 2014 -0600 + + Update README.md + +commit 34917a70297b1785cf01287423067a4e3bef2a7e +Author: Jeff Taggart +Date: Thu Jun 12 08:12:49 2014 -0600 + + Update README.md + +commit 8de579da6aefba919e896197631b9d5b374ca0df +Author: Jeff Taggart +Date: Thu Jun 12 08:11:45 2014 -0600 + + Update README.md + +commit 6b7feddac99a2fb96193faaf900b59db1eda8f76 +Author: Jeff Taggart +Date: Wed Jun 11 14:30:08 2014 -0600 + + Update README.md + +commit fdf01162279fc23c92ad1dbb341d90ef76d705b3 +Author: Jeff Taggart +Date: Sun Jun 8 18:47:52 2014 -0600 + + Update README.md + +commit a3534faad44b2fbee0929a507446b3ed35833721 +Author: Jeff Taggart +Date: Sun Jun 8 18:25:10 2014 -0600 + + Create LICENSE + +commit 6bbd83fabada6c320be243dd9799500a225de646 +Author: Jeff Taggart +Date: Sun Jun 8 18:24:43 2014 -0600 + + Initial commit From 3b69cd31c00b1cb5a4369b3eff6ad86efd6e5f06 Mon Sep 17 00:00:00 2001 From: Hunter Gillane Date: Thu, 12 Jun 2014 08:44:04 -0600 Subject: [PATCH 04/12] edit hello.txt --- hello.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/hello.txt b/hello.txt index 3b18e51..d5151c7 100644 --- a/hello.txt +++ b/hello.txt @@ -1 +1,2 @@ hello world +Oh no! What's going to happen? From 72baae31db45eba2d718ed78acb16b1774bc70db Mon Sep 17 00:00:00 2001 From: Jeff Taggart Date: Thu, 12 Jun 2014 08:44:10 -0600 Subject: [PATCH 05/12] Added a line to hello.txt --- hello.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/hello.txt b/hello.txt index 3b18e51..f676b73 100644 --- a/hello.txt +++ b/hello.txt @@ -1 +1,2 @@ hello world +I hope this makes it! From 1e29a5c5dcfff37181e1d94ab3a9f06a5becb018 Mon Sep 17 00:00:00 2001 From: Lindsay-R Date: Thu, 12 Jun 2014 14:17:14 -0600 Subject: [PATCH 06/12] modified hello.txt --- hello.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/hello.txt b/hello.txt index ffe2383..e69de29 100644 --- a/hello.txt +++ b/hello.txt @@ -1,3 +0,0 @@ -hello world -Oh no! What's going to happen? -I hope this makes it! From ca3233ded8767fe17caa54e146db237e638d3057 Mon Sep 17 00:00:00 2001 From: Lindsay-R Date: Thu, 12 Jun 2014 14:21:42 -0600 Subject: [PATCH 07/12] modified again --- hello.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/hello.txt b/hello.txt index e69de29..3b18e51 100644 --- a/hello.txt +++ b/hello.txt @@ -0,0 +1 @@ +hello world From acf1a0954f59a8a398bb5aa537f2bd81479cc221 Mon Sep 17 00:00:00 2001 From: Lindsay-R Date: Thu, 12 Jun 2014 14:29:05 -0600 Subject: [PATCH 08/12] our log --- git-log.txt | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/git-log.txt b/git-log.txt index 5980c15..62c3460 100644 --- a/git-log.txt +++ b/git-log.txt @@ -1,3 +1,43 @@ +commit ca3233ded8767fe17caa54e146db237e638d3057 +Author: Lindsay-R +Date: Thu Jun 12 14:21:42 2014 -0600 + + modified again + +commit 1e29a5c5dcfff37181e1d94ab3a9f06a5becb018 +Author: Lindsay-R +Date: Thu Jun 12 14:17:14 2014 -0600 + + modified hello.txt + +commit 870fcc092d0c95b660d8896ef0e5f8bdedd1801f +Merge: 3b69cd3 72baae3 +Author: Hunter Gillane +Date: Thu Jun 12 08:45:16 2014 -0600 + + Merge branch 'master' of github.com:jetaggart/basic-git + + Conflicts: + hello.txt + +commit 72baae31db45eba2d718ed78acb16b1774bc70db +Author: Jeff Taggart +Date: Thu Jun 12 08:44:10 2014 -0600 + + Added a line to hello.txt + +commit 3b69cd31c00b1cb5a4369b3eff6ad86efd6e5f06 +Author: Hunter Gillane +Date: Thu Jun 12 08:44:04 2014 -0600 + + edit hello.txt + +commit 69fbea3eb218b9df666a148887324cd5bf0626f5 +Author: Jeff Taggart +Date: Thu Jun 12 08:33:19 2014 -0600 + + Added git-log.txt + commit 11f6f316e7f421e93e1bf176fd748f6403c1923d Author: Jeff Taggart Date: Thu Jun 12 08:32:30 2014 -0600 From e8d302e885fe401c603b2a23745a65008a3709f6 Mon Sep 17 00:00:00 2001 From: Lindsay-R Date: Thu, 12 Jun 2014 14:40:54 -0600 Subject: [PATCH 09/12] Lindsay's Hello --- hello.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/hello.txt b/hello.txt index 3b18e51..f676b73 100644 --- a/hello.txt +++ b/hello.txt @@ -1 +1,2 @@ hello world +I hope this makes it! From 8a05d7a2f32cda4721e92982241e257080b0b311 Mon Sep 17 00:00:00 2001 From: Lindsay-R Date: Thu, 12 Jun 2014 15:03:55 -0600 Subject: [PATCH 10/12] Lindsay's second try --- hello.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/hello.txt b/hello.txt index f676b73..0b7c711 100644 --- a/hello.txt +++ b/hello.txt @@ -1,2 +1,3 @@ hello world I hope this makes it! +Lindsay says, "Wuz sup?" From 19500a1cfa4ed2a4c5a8039ac5bc895867727aec Mon Sep 17 00:00:00 2001 From: Ashley Date: Thu, 12 Jun 2014 15:04:38 -0600 Subject: [PATCH 11/12] Ashley's text --- hello.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/hello.txt b/hello.txt index f676b73..de4f121 100644 --- a/hello.txt +++ b/hello.txt @@ -1,2 +1,3 @@ hello world I hope this makes it! +Oh no! What's going to happen!?! From 21aca6ff0e33d584375088d1f8e7e1c5d66a3b31 Mon Sep 17 00:00:00 2001 From: Lindsay-R Date: Thu, 12 Jun 2014 15:21:46 -0600 Subject: [PATCH 12/12] Log change --- git-log.txt | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/git-log.txt b/git-log.txt index 62c3460..9d54203 100644 --- a/git-log.txt +++ b/git-log.txt @@ -1,3 +1,34 @@ +commit 12b47ef4989c4749ab714021b722cdba7c362604 +Merge: 19500a1 8a05d7a +Author: Ashley +Date: Thu Jun 12 15:16:33 2014 -0600 + + finally? + +commit 19500a1cfa4ed2a4c5a8039ac5bc895867727aec +Author: Ashley +Date: Thu Jun 12 15:04:38 2014 -0600 + + Ashley's text + +commit 8a05d7a2f32cda4721e92982241e257080b0b311 +Author: Lindsay-R +Date: Thu Jun 12 15:03:55 2014 -0600 + + Lindsay's second try + +commit e8d302e885fe401c603b2a23745a65008a3709f6 +Author: Lindsay-R +Date: Thu Jun 12 14:40:54 2014 -0600 + + Lindsay's Hello + +commit acf1a0954f59a8a398bb5aa537f2bd81479cc221 +Author: Lindsay-R +Date: Thu Jun 12 14:29:05 2014 -0600 + + our log + commit ca3233ded8767fe17caa54e146db237e638d3057 Author: Lindsay-R Date: Thu Jun 12 14:21:42 2014 -0600