Merge branch 'master' into master

local changes
Merge pull request 'master' (#5 ) from komal/new-git-fork-test:master into master
2021-11-13 09:01:09 +00:00 · 2021-11-13 14:30:04 +05:30 · 2021-11-12 06:41:52 +00:00 · 2021-11-12 11:09:41 +05:30 · 2021-11-12 05:38:47 +00:00 · 2021-11-10 09:47:54 +00:00
3 changed files with 4 additions and 1 deletions
--- a/file-test.php
+++ b/file-test.php
@ -0,0 +1,2 @@
+//file from fork branch
+//simple push,
--- a/file.php
+++ b/file.php
@ -0,0 +1 @@
+//file form origin
--- a/test.php
+++ b/test.php
@ -1 +1 @@
-sfasdf
+<? sfasdf ?>
Author	SHA1	Message	Date
Komal Parakh	a2339abc3c	Merge branch 'master' into master	2021-11-13 09:01:09 +00:00
Komal Parakh	173a712a88	local changes	2021-11-13 14:30:04 +05:30
vishwanatht	65fd8b0598	Merge pull request 'master' (#5 ) from komal/new-git-fork-test:master into master Reviewed-on: vishwanatht/new-git#5	2021-11-12 06:41:52 +00:00
Komal Parakh	c8017aa9fe	Merge branch 'master' of https://git.aissel.com/vishwanatht/new-git.git	2021-11-12 11:09:41 +05:30
vishwanatht	cb1c6a1423	Add 'file.php'	2021-11-12 05:38:47 +00:00
Komal Parakh	15ea273f99	Add 'file-test.php'	2021-11-10 09:47:54 +00:00
vishwanatht	2cbc8ae89b	Merge pull request 'Update 'test.php'' (#2 ) from vishwanath into master Reviewed-on: vishwanatht/new-git#2	2021-05-24 10:39:26 +00:00
vishwanatht	09911c2b7f	Update 'test.php'	2021-05-24 10:37:14 +00:00