From b95a4fc08c7567fde154b17ec907cebe4dd0f77a Mon Sep 17 00:00:00 2001 From: aleksey_do Date: Mon, 16 Dec 2024 22:02:13 +0300 Subject: [PATCH 1/9] Add README.md --- aleksey_do/README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 aleksey_do/README.md diff --git a/aleksey_do/README.md b/aleksey_do/README.md new file mode 100644 index 000000000..32641c7bd --- /dev/null +++ b/aleksey_do/README.md @@ -0,0 +1 @@ +###### 02. GIT. Local lesson \ No newline at end of file From ce9db246fa788d3fdf236045c0cce90974f7b107 Mon Sep 17 00:00:00 2001 From: aleksey_do Date: Mon, 16 Dec 2024 22:05:50 +0300 Subject: [PATCH 2/9] Update README.md with descr --- aleksey_do/README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/aleksey_do/README.md b/aleksey_do/README.md index 32641c7bd..9ab246678 100644 --- a/aleksey_do/README.md +++ b/aleksey_do/README.md @@ -1 +1,3 @@ -###### 02. GIT. Local lesson \ No newline at end of file +# DevOps course + +Main purpose of this repository is collaboration of homework for study groups \ No newline at end of file From 0b6279e10c963592d3eea71bf9470e69e630383c Mon Sep 17 00:00:00 2001 From: aleksey_do Date: Mon, 16 Dec 2024 22:15:40 +0300 Subject: [PATCH 3/9] Update to tag V2.0 --- aleksey_do/README.md | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/aleksey_do/README.md b/aleksey_do/README.md index 9ab246678..19d9a6fe1 100644 --- a/aleksey_do/README.md +++ b/aleksey_do/README.md @@ -1,3 +1,23 @@ # DevOps course -Main purpose of this repository is collaboration of homework for study groups \ No newline at end of file +Main purpose of this repository is collaboration of homework for study groups + +## Getting Started + +To get started with this project, follow these steps: + +1. Clone the repository: + ```sh + git clone https://github.com/Alex-AGD/sa.it-academy.by.git + ``` +2. Navigate to the project directory: + ```sh + cd your-repo + ``` +3. Install the necessary dependencies: + ```sh + # Example for a Node.js project + npm install + ``` + +## Links \ No newline at end of file From bff96b84e027f6d8b7f8b7bb34f42dd405dc938b Mon Sep 17 00:00:00 2001 From: aleksey_do Date: Mon, 16 Dec 2024 22:19:11 +0300 Subject: [PATCH 4/9] Update README.md for bug fix branch --- aleksey_do/README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aleksey_do/README.md b/aleksey_do/README.md index 19d9a6fe1..8f98c043f 100644 --- a/aleksey_do/README.md +++ b/aleksey_do/README.md @@ -20,4 +20,7 @@ To get started with this project, follow these steps: npm install ``` -## Links \ No newline at end of file +## Links + ```sh + - How to join to the course [IT Academy site](https://www.it-academy.by/) + ``` \ No newline at end of file From 98bde611639a7364f79b6db5ecaea6366f9157ca Mon Sep 17 00:00:00 2001 From: aleksey_do Date: Mon, 16 Dec 2024 22:23:55 +0300 Subject: [PATCH 5/9] Update README for stash --- aleksey_do/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aleksey_do/README.md b/aleksey_do/README.md index 8f98c043f..6f2f315ce 100644 --- a/aleksey_do/README.md +++ b/aleksey_do/README.md @@ -22,5 +22,5 @@ To get started with this project, follow these steps: ## Links ```sh - - How to join to the course [IT Academy site](https://www.it-academy.by/) + - How to join to the course [IT Academy site](https://www.it-academy.by/) ssh ``` \ No newline at end of file From cdc145e21a0e4c017e204004ab8f64033269f6e1 Mon Sep 17 00:00:00 2001 From: aleksey_do Date: Mon, 16 Dec 2024 22:25:00 +0300 Subject: [PATCH 6/9] Resolve merge conflict in README.md --- aleksey_do/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aleksey_do/README.md b/aleksey_do/README.md index 6f2f315ce..1f5b97bc8 100644 --- a/aleksey_do/README.md +++ b/aleksey_do/README.md @@ -22,5 +22,5 @@ To get started with this project, follow these steps: ## Links ```sh - - How to join to the course [IT Academy site](https://www.it-academy.by/) ssh + - How to join to the course [IT Academy site](https://www.it-academy.by/) doned ``` \ No newline at end of file From 06d0bcb1bf6006547d05c4fc492fdd496a9f2ff4 Mon Sep 17 00:00:00 2001 From: aleksey_do Date: Mon, 16 Dec 2024 22:33:30 +0300 Subject: [PATCH 7/9] Add history --- aleksey_do/README.md | 26 -------------------------- 1 file changed, 26 deletions(-) delete mode 100644 aleksey_do/README.md diff --git a/aleksey_do/README.md b/aleksey_do/README.md deleted file mode 100644 index 1f5b97bc8..000000000 --- a/aleksey_do/README.md +++ /dev/null @@ -1,26 +0,0 @@ -# DevOps course - -Main purpose of this repository is collaboration of homework for study groups - -## Getting Started - -To get started with this project, follow these steps: - -1. Clone the repository: - ```sh - git clone https://github.com/Alex-AGD/sa.it-academy.by.git - ``` -2. Navigate to the project directory: - ```sh - cd your-repo - ``` -3. Install the necessary dependencies: - ```sh - # Example for a Node.js project - npm install - ``` - -## Links - ```sh - - How to join to the course [IT Academy site](https://www.it-academy.by/) doned - ``` \ No newline at end of file From d0f3469a5330fd257012681051acb37deb444d4d Mon Sep 17 00:00:00 2001 From: aleksey_do Date: Mon, 16 Dec 2024 22:33:55 +0300 Subject: [PATCH 8/9] Add history --- aleksey_do/README.md | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 aleksey_do/README.md diff --git a/aleksey_do/README.md b/aleksey_do/README.md new file mode 100644 index 000000000..1f5b97bc8 --- /dev/null +++ b/aleksey_do/README.md @@ -0,0 +1,26 @@ +# DevOps course + +Main purpose of this repository is collaboration of homework for study groups + +## Getting Started + +To get started with this project, follow these steps: + +1. Clone the repository: + ```sh + git clone https://github.com/Alex-AGD/sa.it-academy.by.git + ``` +2. Navigate to the project directory: + ```sh + cd your-repo + ``` +3. Install the necessary dependencies: + ```sh + # Example for a Node.js project + npm install + ``` + +## Links + ```sh + - How to join to the course [IT Academy site](https://www.it-academy.by/) doned + ``` \ No newline at end of file From f69522fcaa5ebf050266cfec8c71f7e954ea21c8 Mon Sep 17 00:00:00 2001 From: aleksey_do Date: Mon, 16 Dec 2024 22:37:17 +0300 Subject: [PATCH 9/9] Add history --- aleksey_do/README.md | 88 +++++++++++++++++++++++++++++++------------- 1 file changed, 62 insertions(+), 26 deletions(-) diff --git a/aleksey_do/README.md b/aleksey_do/README.md index 1f5b97bc8..9947f7326 100644 --- a/aleksey_do/README.md +++ b/aleksey_do/README.md @@ -1,26 +1,62 @@ -# DevOps course - -Main purpose of this repository is collaboration of homework for study groups - -## Getting Started - -To get started with this project, follow these steps: - -1. Clone the repository: - ```sh - git clone https://github.com/Alex-AGD/sa.it-academy.by.git - ``` -2. Navigate to the project directory: - ```sh - cd your-repo - ``` -3. Install the necessary dependencies: - ```sh - # Example for a Node.js project - npm install - ``` - -## Links - ```sh - - How to join to the course [IT Academy site](https://www.it-academy.by/) doned - ``` \ No newline at end of file +# 02. GIT. Local + ```bash +17 пше +18 ssh-keygen -t rsa 4098 -C "a.dolgopolov@a1.by" +19 ssh-keygen -t rsa -b 4098 -C "a.dolgopolov@a1.by" +20 eval "$(ssh-agent -s)" +21 ssh-add ~/.ssh/id_rsa +22 eval "$(ssh-agent -s)" +23 ssh-add ~/.ssh/id_rsa +24 cat ~/.ssh/id_rsa.pub | clip +25 history +26 git add +27 git add README.md +28 git commit -m "Add README.md file" +29 git log +30 git commit -m "Add README.md" +31 git add README.md +32 git commit -m "Add README.md" +33 git add aleksey_do/README.md +34* +35 history +36 git checkout -b feature-branch +37 git commit -m "Add README.md" +38 git add aleksey_do/README.md +39 git commit -m "Update README.md with descr" +40 git checkout master +41 git merge feature-branch +42 git log +43 git show b95a4fc08c7567fde154b17ec907cebe4dd0f77a +44 git tag v1.0 commit-hash +45 git log +46 git show +47 git tag v1.0 ce9db246fa788d3fdf236045c0cce90974f7b107 +48 git commit aleksey_do/README.md +49 git commit -m "Update to tag V2.0 +git log +50 git commit -m "Update to tag V2.0" +51 git add aleksey_do/README.md +52 git commit -m "Update to tag V2.0" +53 git log +54 git tag v2.0 0b6279e10c963592d3eea71bf9470e69e630383c +55 git checkout bug-fix +56 git checkout -b bug-fix +57 git add aleksey_do/README.md +59 git add aleksey_do/README.md +60 git commit -m "Update README.md for bug fix branch1" +61 git reset +62 git reset --soft HEAD~1 +63 git checkout -b experimental-feature +64 git stash +65 git checkout bug-fix +66 git stash apply +67 git add aleksey_do/README.md +68 git commit -m "Update README for stash" +69 git stash apply +70 git add aleksey_do/README.md +71 git commit -m "Resolve merge conflict in README.md" +72 git checkout +73 git checkout master +74 git merge bug-fix +75 history +``` \ No newline at end of file