From bfe84c4ad4e6163421c027d3e0faf4bf3009275b Mon Sep 17 00:00:00 2001 From: Dmitri Zaitsev Date: Sat, 25 Apr 2015 12:45:50 +0100 Subject: [PATCH 1/4] more master1 master2 --- feat-new-1 | 0 feat3-file | 4 ---- local-new-file | 2 -- 3 files changed, 6 deletions(-) delete mode 100644 feat-new-1 delete mode 100644 feat3-file delete mode 100644 local-new-file diff --git a/feat-new-1 b/feat-new-1 deleted file mode 100644 index e69de29..0000000 diff --git a/feat3-file b/feat3-file deleted file mode 100644 index 6ed15ec..0000000 --- a/feat3-file +++ /dev/null @@ -1,4 +0,0 @@ -Edit by Boss - ---- -You are so correct, Boss! diff --git a/local-new-file b/local-new-file deleted file mode 100644 index cfbb771..0000000 --- a/local-new-file +++ /dev/null @@ -1,2 +0,0 @@ -Time for new content! -And some more here From 1ec6b1b1f118346e2fa1dfb5fbb48d197e073624 Mon Sep 17 00:00:00 2001 From: Dmitri Zaitsev Date: Sat, 25 Apr 2015 12:55:02 +0100 Subject: [PATCH 2/4] client1 --- client | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 client diff --git a/client b/client new file mode 100644 index 0000000..e69de29 From 71644eaa69f4a4332bd20f9642bdcce47d71b787 Mon Sep 17 00:00:00 2001 From: dmitriz Date: Sat, 9 Jan 2016 04:36:05 +0000 Subject: [PATCH 3/4] cleanup --- fork-testing | 1 + 1 file changed, 1 insertion(+) create mode 160000 fork-testing diff --git a/fork-testing b/fork-testing new file mode 160000 index 0000000..bb65527 --- /dev/null +++ b/fork-testing @@ -0,0 +1 @@ +Subproject commit bb655271fb4e4766be7bf2bf19a8297da08c6087 From 2b52586cdd15c8fc9e08fb4abd25fdaa82087ecb Mon Sep 17 00:00:00 2001 From: dmitriz Date: Sat, 9 Jan 2016 04:38:42 +0000 Subject: [PATCH 4/4] add nonsense --- i-am-a-file | 2 ++ 1 file changed, 2 insertions(+) diff --git a/i-am-a-file b/i-am-a-file index 58009c5..d359296 100644 --- a/i-am-a-file +++ b/i-am-a-file @@ -1 +1,3 @@ I was empty but now I'm full! + +I propose: Remove this nonsense!