From 176717859f1c8fc51cedab5ce0eac60a3175afcc Mon Sep 17 00:00:00 2001 From: simphiwekona Date: Tue, 7 Mar 2023 09:41:16 -0800 Subject: [PATCH 1/6] My personal work --- 0x03-git/bash/98 | 0 0x03-git/bash/alx | 1 + 0x03-git/bash/school | 1 + 3 files changed, 2 insertions(+) create mode 100644 0x03-git/bash/98 diff --git a/0x03-git/bash/98 b/0x03-git/bash/98 new file mode 100644 index 0000000..e69de29 diff --git a/0x03-git/bash/alx b/0x03-git/bash/alx index edbb121..3ddd41d 100644 --- a/0x03-git/bash/alx +++ b/0x03-git/bash/alx @@ -1,2 +1,3 @@ #!/bin/bash echo"ALX" +echo"ALX School" diff --git a/0x03-git/bash/school b/0x03-git/bash/school index 60b2812..7163356 100644 --- a/0x03-git/bash/school +++ b/0x03-git/bash/school @@ -1,2 +1,3 @@ #!/bin/bash echo"School" +echo"The school is open!" From 7a25ea1a80e8db02bb4784e386dfd3fb339a12dc Mon Sep 17 00:00:00 2001 From: simphiwekona Date: Tue, 7 Mar 2023 09:47:32 -0800 Subject: [PATCH 2/6] Hot fix --- 0x03-git/bash/alx | 1 + 0x03-git/js/index.js | 0 0x03-git/js/main.js | 0 3 files changed, 1 insertion(+) delete mode 100644 0x03-git/js/index.js delete mode 100644 0x03-git/js/main.js diff --git a/0x03-git/bash/alx b/0x03-git/bash/alx index 3ddd41d..87081da 100644 --- a/0x03-git/bash/alx +++ b/0x03-git/bash/alx @@ -1,3 +1,4 @@ #!/bin/bash echo"ALX" echo"ALX School" +echo"ALX School is so cool!" diff --git a/0x03-git/js/index.js b/0x03-git/js/index.js deleted file mode 100644 index e69de29..0000000 diff --git a/0x03-git/js/main.js b/0x03-git/js/main.js deleted file mode 100644 index e69de29..0000000 From 2560a9bf3d930da4de1fbb398df8c925cc6c6ceb Mon Sep 17 00:00:00 2001 From: simphiwekona Date: Tue, 7 Mar 2023 11:10:15 -0800 Subject: [PATCH 3/6] How to be up to date in git --- 0x03-git/test | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 0x03-git/test diff --git a/0x03-git/test b/0x03-git/test new file mode 100644 index 0000000..e69de29 From e0bc7aea8a8cea5964b535b21e2d3d607bd34725 Mon Sep 17 00:00:00 2001 From: simphiwekona Date: Tue, 7 Mar 2023 11:12:08 -0800 Subject: [PATCH 4/6] How to be up to date in git --- 0x03-git/up_to_date | 1 + 1 file changed, 1 insertion(+) create mode 100644 0x03-git/up_to_date diff --git a/0x03-git/up_to_date b/0x03-git/up_to_date new file mode 100644 index 0000000..6735473 --- /dev/null +++ b/0x03-git/up_to_date @@ -0,0 +1 @@ +git push - origin main From 3fc7f25bc278308a9615714ac4c90df0aa4f81bc Mon Sep 17 00:00:00 2001 From: simphiwekona Date: Tue, 7 Mar 2023 11:16:43 -0800 Subject: [PATCH 5/6] How to be up to date in git --- 0x03-git/up_to_date | 1 + 1 file changed, 1 insertion(+) diff --git a/0x03-git/up_to_date b/0x03-git/up_to_date index 6735473..cb12391 100644 --- a/0x03-git/up_to_date +++ b/0x03-git/up_to_date @@ -1 +1,2 @@ git push - origin main +git pull From 50b6c8e5af5cf5eb57d3ed5b08ae6e1fb295b342 Mon Sep 17 00:00:00 2001 From: simphiwekona Date: Tue, 7 Mar 2023 11:22:13 -0800 Subject: [PATCH 6/6] How to be up to date in git --- 0x03-git/.gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 0x03-git/.gitignore diff --git a/0x03-git/.gitignore b/0x03-git/.gitignore new file mode 100644 index 0000000..b25c15b --- /dev/null +++ b/0x03-git/.gitignore @@ -0,0 +1 @@ +*~