From f7ec329451741d351af751308df5d3ccf04927d9 Mon Sep 17 00:00:00 2001 From: github764 Date: Sun, 3 Jun 2018 16:16:21 +0100 Subject: [PATCH 1/5] Edit from intellij --- test1.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/test1.txt b/test1.txt index e69de29..e059e89 100644 --- a/test1.txt +++ b/test1.txt @@ -0,0 +1 @@ +edit from intellij \ No newline at end of file From e29c41fc7bdeb0d4522c104f88722a122ee718bc Mon Sep 17 00:00:00 2001 From: github764 Date: Sun, 3 Jun 2018 16:17:17 +0100 Subject: [PATCH 2/5] Edit from intellij --- test1.txt => test1intellih.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename test1.txt => test1intellih.txt (100%) diff --git a/test1.txt b/test1intellih.txt similarity index 100% rename from test1.txt rename to test1intellih.txt From 9d33c27afc69b1235712a5b72de1d97507849158 Mon Sep 17 00:00:00 2001 From: github764 Date: Sun, 3 Jun 2018 16:26:28 +0100 Subject: [PATCH 3/5] committed from commandline --- test1intellih.txt => test1cmd.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename test1intellih.txt => test1cmd.txt (100%) diff --git a/test1intellih.txt b/test1cmd.txt similarity index 100% rename from test1intellih.txt rename to test1cmd.txt From 1b4f86b3febbf594a730a294d52b4fe037837689 Mon Sep 17 00:00:00 2001 From: github764 Date: Sun, 3 Jun 2018 17:13:25 +0100 Subject: [PATCH 4/5] Edit from intellij --- test1cmd.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test1cmd.txt b/test1cmd.txt index e059e89..c409ca7 100644 --- a/test1cmd.txt +++ b/test1cmd.txt @@ -1 +1,2 @@ -edit from intellij \ No newline at end of file +edit from intellij +edited from intellij \ No newline at end of file From bc92b73443f6ad2089d401eaa77c84def04771e8 Mon Sep 17 00:00:00 2001 From: github764 Date: Sun, 3 Jun 2018 17:14:03 +0100 Subject: [PATCH 5/5] commit from cmdline --- test1cmd.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test1cmd.txt b/test1cmd.txt index e059e89..fc9a998 100644 --- a/test1cmd.txt +++ b/test1cmd.txt @@ -1 +1,2 @@ -edit from intellij \ No newline at end of file +edit from intellij +edited from master branch \ No newline at end of file