From 5455705a75ed148e86b4aa09221806baad3e5acd Mon Sep 17 00:00:00 2001 From: Nick Snyder Date: Fri, 9 Jun 2017 13:37:00 -0700 Subject: [PATCH 1/7] delete file --- deleted.go | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 deleted.go diff --git a/deleted.go b/deleted.go deleted file mode 100644 index 9e6f2f9..0000000 --- a/deleted.go +++ /dev/null @@ -1,5 +0,0 @@ -package main - -func deleted() { - -} From 4689c5d588108a49345c0b1c670b863003d8d2d7 Mon Sep 17 00:00:00 2001 From: Nick Snyder Date: Fri, 9 Jun 2017 13:37:15 -0700 Subject: [PATCH 2/7] modify file --- modified.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modified.go b/modified.go index 47ceba6..2823466 100644 --- a/modified.go +++ b/modified.go @@ -3,5 +3,5 @@ package main import "fmt" func modified() { - fmt.Println("before") + fmt.Println("after") } From b48410a0d97764722f2f6139a5e500fc5b2d53c7 Mon Sep 17 00:00:00 2001 From: Nick Snyder Date: Fri, 9 Jun 2017 13:39:57 -0700 Subject: [PATCH 3/7] rename not modified --- renamed_from_not_modified.go => renamed_to_not_modified.go | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename renamed_from_not_modified.go => renamed_to_not_modified.go (100%) diff --git a/renamed_from_not_modified.go b/renamed_to_not_modified.go similarity index 100% rename from renamed_from_not_modified.go rename to renamed_to_not_modified.go From 36c3172be281bb44c14d625dad0781d56207e0bf Mon Sep 17 00:00:00 2001 From: Nick Snyder Date: Fri, 9 Jun 2017 13:40:27 -0700 Subject: [PATCH 4/7] rename and modify --- renamed_from_modified.go => renamed_to_modified.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename renamed_from_modified.go => renamed_to_modified.go (71%) diff --git a/renamed_from_modified.go b/renamed_to_modified.go similarity index 71% rename from renamed_from_modified.go rename to renamed_to_modified.go index fc40cb6..16d90b0 100644 --- a/renamed_from_modified.go +++ b/renamed_to_modified.go @@ -3,5 +3,5 @@ package main import "fmt" func renamedAndModified() { - fmt.Println("before") + fmt.Println("after") } From 90f22231392d37ab959d58e6756a5e128b97a349 Mon Sep 17 00:00:00 2001 From: Nick Snyder Date: Fri, 9 Jun 2017 13:41:19 -0700 Subject: [PATCH 5/7] copy --- copied_to.go | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 copied_to.go diff --git a/copied_to.go b/copied_to.go new file mode 100644 index 0000000..e732d6c --- /dev/null +++ b/copied_to.go @@ -0,0 +1,5 @@ +package main + +func copiedTo() { + +} From d93f2a45fcc99940a14776bb072d1e975953e35b Mon Sep 17 00:00:00 2001 From: Nick Snyder Date: Fri, 9 Jun 2017 16:53:15 -0700 Subject: [PATCH 6/7] unedited copy --- README.unedited.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 README.unedited.md diff --git a/README.unedited.md b/README.unedited.md new file mode 100644 index 0000000..b74e73f --- /dev/null +++ b/README.unedited.md @@ -0,0 +1,9 @@ +# diff + +This repo contains a few commits that enumerate many of the possible scenarios related to diffing: +- adding a file +- removing a file +- modifing a file +- renaming a file +- renaming a file and modifying it +- copying a file From 907980552dbda8c812ba750f17439e66d0ab6a0f Mon Sep 17 00:00:00 2001 From: Nick Snyder Date: Fri, 9 Jun 2017 16:54:05 -0700 Subject: [PATCH 7/7] copy and modify --- README.edited.md | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 README.edited.md diff --git a/README.edited.md b/README.edited.md new file mode 100644 index 0000000..d71f031 --- /dev/null +++ b/README.edited.md @@ -0,0 +1,10 @@ +# diff + +This repo contains a few commits that enumerate many of the possible scenarios related to diffing: +- adding a file +- removing a file +- modifing a file +- renaming a file +- renaming a file and modifying it +- copying a file +- copying a file and modifying it