From 4ef06c7ecf3b27b9c8c2a6ebffaa9d2f3887b52d Mon Sep 17 00:00:00 2001 From: Nonso024 Date: Mon, 26 Sep 2022 12:24:52 -0700 Subject: [PATCH 01/10] Hot fix --- 0x01-git/bash/alx | 4 ++-- 0x01-git/js/index.js | 0 0x01-git/js/main.js | 0 3 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 0x01-git/js/index.js delete mode 100644 0x01-git/js/main.js diff --git a/0x01-git/bash/alx b/0x01-git/bash/alx index 748fce8..e0c30ce 100644 --- a/0x01-git/bash/alx +++ b/0x01-git/bash/alx @@ -1,2 +1,2 @@ -#!/bin/bash -ALX +#!bin/bash +ALX School is so cool! diff --git a/0x01-git/js/index.js b/0x01-git/js/index.js deleted file mode 100644 index e69de29..0000000 diff --git a/0x01-git/js/main.js b/0x01-git/js/main.js deleted file mode 100644 index e69de29..0000000 From 40bde330ebcdcf616ea0d0d1bee6b9d4a52f8b7e Mon Sep 17 00:00:00 2001 From: Nonso024 Date: Mon, 26 Sep 2022 12:45:49 -0700 Subject: [PATCH 02/10] Cool, all my changes will be now part of the main branch, ready to be deployed! --- 0x01-git/bash/98 | 0 0x01-git/bash/alx | 5 +++++ 0x01-git/bash/school | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 0x01-git/bash/98 diff --git a/0x01-git/bash/98 b/0x01-git/bash/98 new file mode 100644 index 0000000..e69de29 diff --git a/0x01-git/bash/alx b/0x01-git/bash/alx index e0c30ce..f09584b 100644 --- a/0x01-git/bash/alx +++ b/0x01-git/bash/alx @@ -1,2 +1,7 @@ +<<<<<<< HEAD #!bin/bash ALX School is so cool! +======= +#!/bin/bash +ALX school +>>>>>>> update_script diff --git a/0x01-git/bash/school b/0x01-git/bash/school index de26587..367c8ee 100644 --- a/0x01-git/bash/school +++ b/0x01-git/bash/school @@ -1,2 +1,2 @@ #!/bin/bash -School +The school is open! From f2847a7b9c7ddcb3d19cc2898b1e41e55211c78c Mon Sep 17 00:00:00 2001 From: Nonso024 Date: Mon, 26 Sep 2022 13:00:32 -0700 Subject: [PATCH 03/10] Cool, all my changes will be now part of the main branch, ready to be deployed! --- 0x01-git/bash/alx | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/0x01-git/bash/alx b/0x01-git/bash/alx index f09584b..a9ad8c8 100644 --- a/0x01-git/bash/alx +++ b/0x01-git/bash/alx @@ -1,7 +1,2 @@ -<<<<<<< HEAD #!bin/bash -ALX School is so cool! -======= -#!/bin/bash -ALX school ->>>>>>> update_script +Alx School is so cool! From 7bd1640252306b7ed24dd42dedb875eb824dc28f Mon Sep 17 00:00:00 2001 From: Nonso024 Date: Mon, 26 Sep 2022 13:04:31 -0700 Subject: [PATCH 04/10] Cool, all my changes will be now part of the main branch, ready to be deployed! --- 0x01-git/bash/alx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/0x01-git/bash/alx b/0x01-git/bash/alx index a9ad8c8..e0c30ce 100644 --- a/0x01-git/bash/alx +++ b/0x01-git/bash/alx @@ -1,2 +1,2 @@ #!bin/bash -Alx School is so cool! +ALX School is so cool! From 0ad81e84f8929392bad0e7972054d6d0c40ee0af Mon Sep 17 00:00:00 2001 From: Nonso024 Date: Mon, 26 Sep 2022 13:14:30 -0700 Subject: [PATCH 05/10] my gitignore file --- 0x01-git/.gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 0x01-git/.gitignore diff --git a/0x01-git/.gitignore b/0x01-git/.gitignore new file mode 100644 index 0000000..fd12ff6 --- /dev/null +++ b/0x01-git/.gitignore @@ -0,0 +1 @@ +~/.gitignore From 48c53469d623f4d05ffa42f809034adb786f914d Mon Sep 17 00:00:00 2001 From: Nonso024 Date: Tue, 4 Oct 2022 11:05:40 -0700 Subject: [PATCH 06/10] Hot fix --- 0x03-git/.gitignore | 1 + 0x03-git/README.md | 1 + 0x03-git/bash/98 | 0 0x03-git/bash/alx | 2 ++ 0x03-git/bash/school | 2 ++ 0x03-git/c/c_is_fun.c | 0 0x03-git/up_to_date | 1 + 7 files changed, 7 insertions(+) create mode 100644 0x03-git/.gitignore create mode 100644 0x03-git/README.md create mode 100644 0x03-git/bash/98 create mode 100644 0x03-git/bash/alx create mode 100644 0x03-git/bash/school create mode 100644 0x03-git/c/c_is_fun.c create mode 100644 0x03-git/up_to_date diff --git a/0x03-git/.gitignore b/0x03-git/.gitignore new file mode 100644 index 0000000..fd12ff6 --- /dev/null +++ b/0x03-git/.gitignore @@ -0,0 +1 @@ +~/.gitignore diff --git a/0x03-git/README.md b/0x03-git/README.md new file mode 100644 index 0000000..d7488d1 --- /dev/null +++ b/0x03-git/README.md @@ -0,0 +1 @@ +My second commit 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 new file mode 100644 index 0000000..e0c30ce --- /dev/null +++ b/0x03-git/bash/alx @@ -0,0 +1,2 @@ +#!bin/bash +ALX School is so cool! diff --git a/0x03-git/bash/school b/0x03-git/bash/school new file mode 100644 index 0000000..367c8ee --- /dev/null +++ b/0x03-git/bash/school @@ -0,0 +1,2 @@ +#!/bin/bash +The school is open! diff --git a/0x03-git/c/c_is_fun.c b/0x03-git/c/c_is_fun.c new file mode 100644 index 0000000..e69de29 diff --git a/0x03-git/up_to_date b/0x03-git/up_to_date new file mode 100644 index 0000000..d0aed61 --- /dev/null +++ b/0x03-git/up_to_date @@ -0,0 +1 @@ +git pull From 4930d39778ab9a2a77d5a8c4fb975a5c5f4a4aff Mon Sep 17 00:00:00 2001 From: JOSEPH ANI <60388143+Nonso024@users.noreply.github.com> Date: Tue, 4 Oct 2022 20:11:07 +0100 Subject: [PATCH 07/10] Delete .gitignore --- 0x01-git/.gitignore | 1 - 1 file changed, 1 deletion(-) delete mode 100644 0x01-git/.gitignore diff --git a/0x01-git/.gitignore b/0x01-git/.gitignore deleted file mode 100644 index fd12ff6..0000000 --- a/0x01-git/.gitignore +++ /dev/null @@ -1 +0,0 @@ -~/.gitignore From b73548181edd73778d2779364c99493368b2727f Mon Sep 17 00:00:00 2001 From: JOSEPH ANI <60388143+Nonso024@users.noreply.github.com> Date: Tue, 4 Oct 2022 20:11:23 +0100 Subject: [PATCH 08/10] Delete school --- 0x01-git/bash/school | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 0x01-git/bash/school diff --git a/0x01-git/bash/school b/0x01-git/bash/school deleted file mode 100644 index 367c8ee..0000000 --- a/0x01-git/bash/school +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -The school is open! From b7f71700a14520a37b2d265d97f518ca8b9d0d6d Mon Sep 17 00:00:00 2001 From: JOSEPH ANI <60388143+Nonso024@users.noreply.github.com> Date: Tue, 4 Oct 2022 20:11:36 +0100 Subject: [PATCH 09/10] Delete alx --- 0x01-git/bash/alx | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 0x01-git/bash/alx diff --git a/0x01-git/bash/alx b/0x01-git/bash/alx deleted file mode 100644 index e0c30ce..0000000 --- a/0x01-git/bash/alx +++ /dev/null @@ -1,2 +0,0 @@ -#!bin/bash -ALX School is so cool! From bbfe1576a7d2f141b378d471980dea481be4a37b Mon Sep 17 00:00:00 2001 From: JOSEPH ANI <60388143+Nonso024@users.noreply.github.com> Date: Tue, 4 Oct 2022 20:12:16 +0100 Subject: [PATCH 10/10] Delete 98 --- 0x01-git/bash/98 | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 0x01-git/bash/98 diff --git a/0x01-git/bash/98 b/0x01-git/bash/98 deleted file mode 100644 index e69de29..0000000