From 1e2af024fe577e997d2bf7a38e3f190f4991b884 Mon Sep 17 00:00:00 2001 From: Milind Joshi Date: Fri, 22 Aug 2014 18:08:46 +0530 Subject: [PATCH 01/12] Create another-file --- another-file | 1 + 1 file changed, 1 insertion(+) create mode 100644 another-file diff --git a/another-file b/another-file new file mode 100644 index 00000000..ef934c58 --- /dev/null +++ b/another-file @@ -0,0 +1 @@ +This file was created after the repo was forked. From 5f91882ff193c2852064a4e48c937854023300ad Mon Sep 17 00:00:00 2001 From: userIM Date: Thu, 24 Sep 2015 14:47:44 +0300 Subject: [PATCH 02/12] Create learningGithub just a test --- learningGithub | 1 + 1 file changed, 1 insertion(+) create mode 100644 learningGithub diff --git a/learningGithub b/learningGithub new file mode 100644 index 00000000..87cea0be --- /dev/null +++ b/learningGithub @@ -0,0 +1 @@ +Stuttgart From ef562160954384c38a2e4632a19c01e7f02e58d4 Mon Sep 17 00:00:00 2001 From: userIM Date: Thu, 24 Sep 2015 16:06:11 +0300 Subject: [PATCH 03/12] Create newFile2onFork --- newFile2onFork | 1 + 1 file changed, 1 insertion(+) create mode 100644 newFile2onFork diff --git a/newFile2onFork b/newFile2onFork new file mode 100644 index 00000000..ca59c995 --- /dev/null +++ b/newFile2onFork @@ -0,0 +1 @@ +this file is on my fork From 6ac69f32ce3f0e6a9a53abfbfcb5d828b7077c4c Mon Sep 17 00:00:00 2001 From: userIM Date: Thu, 24 Sep 2015 16:35:27 +0300 Subject: [PATCH 04/12] Update newFile2onFork first modification added --- newFile2onFork | 1 + 1 file changed, 1 insertion(+) diff --git a/newFile2onFork b/newFile2onFork index ca59c995..b75c5951 100644 --- a/newFile2onFork +++ b/newFile2onFork @@ -1 +1,2 @@ this file is on my fork +files first modification From 40303173c0321020e4341487afde50298752b4a8 Mon Sep 17 00:00:00 2001 From: userIM Date: Thu, 24 Sep 2015 17:30:26 +0300 Subject: [PATCH 05/12] Update newFile2onFork this is my second modification --- newFile2onFork | 1 + 1 file changed, 1 insertion(+) diff --git a/newFile2onFork b/newFile2onFork index b75c5951..de184d94 100644 --- a/newFile2onFork +++ b/newFile2onFork @@ -1,2 +1,3 @@ this file is on my fork files first modification +second modification From 5d0ce49d5e15b7e43440b6f2f05454fcf84d0fed Mon Sep 17 00:00:00 2001 From: userIM Date: Thu, 24 Sep 2015 17:41:25 +0300 Subject: [PATCH 06/12] Rename learningGithub to folder1/learningGithub --- learningGithub => folder1/learningGithub | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename learningGithub => folder1/learningGithub (100%) diff --git a/learningGithub b/folder1/learningGithub similarity index 100% rename from learningGithub rename to folder1/learningGithub From 0407630d35b99e73ab556a7e53c551ad05c21f4a Mon Sep 17 00:00:00 2001 From: userIM Date: Thu, 24 Sep 2015 17:46:45 +0300 Subject: [PATCH 07/12] Rename folder1/learningGithub to learningGithub removed folder --- folder1/learningGithub => learningGithub | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename folder1/learningGithub => learningGithub (100%) diff --git a/folder1/learningGithub b/learningGithub similarity index 100% rename from folder1/learningGithub rename to learningGithub From d9044f07d5c75e4eb06ed6f999fb2463057ab10d Mon Sep 17 00:00:00 2001 From: userIM Date: Thu, 24 Sep 2015 17:47:16 +0300 Subject: [PATCH 08/12] Rename learningGithub to folder2/learningGithub --- learningGithub => folder2/learningGithub | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename learningGithub => folder2/learningGithub (100%) diff --git a/learningGithub b/folder2/learningGithub similarity index 100% rename from learningGithub rename to folder2/learningGithub From b893dea2fb839c3b2465647de18d36c04d32ce25 Mon Sep 17 00:00:00 2001 From: userIM Date: Thu, 24 Sep 2015 19:44:04 +0300 Subject: [PATCH 09/12] Update newFile2onFork first branch modif --- newFile2onFork | 1 + 1 file changed, 1 insertion(+) diff --git a/newFile2onFork b/newFile2onFork index de184d94..cce63f9f 100644 --- a/newFile2onFork +++ b/newFile2onFork @@ -1,3 +1,4 @@ this file is on my fork files first modification second modification +modification on the firstbranch From 894a37566607954ebdc2bb623de31236da78150a Mon Sep 17 00:00:00 2001 From: userIM Date: Thu, 24 Sep 2015 19:44:51 +0300 Subject: [PATCH 10/12] Create .gitkeep --- FolderBranch/.gitkeep | 1 + 1 file changed, 1 insertion(+) create mode 100644 FolderBranch/.gitkeep diff --git a/FolderBranch/.gitkeep b/FolderBranch/.gitkeep new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/FolderBranch/.gitkeep @@ -0,0 +1 @@ + From c33e5e82ad2b30862feb7465bbcd68baa650fc97 Mon Sep 17 00:00:00 2001 From: userIM Date: Thu, 24 Sep 2015 19:45:35 +0300 Subject: [PATCH 11/12] Create newfilebranchhi --- newfilebranchhi | 1 + 1 file changed, 1 insertion(+) create mode 100644 newfilebranchhi diff --git a/newfilebranchhi b/newfilebranchhi new file mode 100644 index 00000000..15b46845 --- /dev/null +++ b/newfilebranchhi @@ -0,0 +1 @@ +Hi how is going today From 53acb2178adf0b0c8770c1659a62b6cb50da54cc Mon Sep 17 00:00:00 2001 From: userIM Date: Thu, 24 Sep 2015 19:48:59 +0300 Subject: [PATCH 12/12] Update newFile2onFork non merge-able file change --- newFile2onFork | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/newFile2onFork b/newFile2onFork index cce63f9f..3eeb3d94 100644 --- a/newFile2onFork +++ b/newFile2onFork @@ -1,4 +1,4 @@ this file is on my fork files first modification second modification -modification on the firstbranch +this modif wont be easy to merge :-)) so what happens now