From 9ee31514c3f516c254a5eb876d4e3a36f89c1d57 Mon Sep 17 00:00:00 2001 From: deks59rus Date: Mon, 11 Nov 2024 21:43:59 +0500 Subject: [PATCH 1/3] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=20=D0=BF=D1=80=D0=BE=D0=B8=D0=B7=D0=B2=D0=BE=D0=BB=D1=8C?= =?UTF-8?q?=D0=BD=D1=8B=D0=B9=20=D1=81=D0=BA=D1=80=D0=B8=D0=BF=D1=82.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- USER_HISTORY.txt | 119 +++++++++++++++++++++++++++++++++++++++++++++++ backup.sh | 12 +++++ 2 files changed, 131 insertions(+) create mode 100644 USER_HISTORY.txt create mode 100644 backup.sh diff --git a/USER_HISTORY.txt b/USER_HISTORY.txt new file mode 100644 index 00000000..f7cd01bb --- /dev/null +++ b/USER_HISTORY.txt @@ -0,0 +1,119 @@ + + 141 cd ../git/test + 142 cd ./git/test + 143 git clone gh repo clone deks59rus/0_git_basics_DPI22-1 + 144 git clone gh repo clone "deks59rus/0_git_basics_DPI22-1" + 145 - + 146 git clone "deks59rus/0_git_basics_DPI22-1" + 147 git clone deks59rus/0_git_basics_DPI22-1 + 148 gh repo clone deks59rus/0_git_basics_DPI22-1 + 149 git repo clone deks59rus/0_git_basics_DPI22-1 + 150 git clone deks59rus/0_git_basics_DPI22-1 + 151 git@github.com:deks59rus/0_git_basics_DPI22-1.git + 152 git clone https://github.com/deks59rus/0_git_basics_DPI22-1.git + 153 git commit + 154 cd ./0_git_basics_DPI22-1 + 155 git commit + 156 git add --am + 157 git add all + 158 git add --all + 159 git status + 160 git commit + 161 echo "Как тебя зовут?" + 162 read name + 163 echo "Здравствуй, $name!" + 164 echo "Press any key to continue..." + 165 read -n 1 -s + 166 echo "" + 167 history + 168 git checkout de8c13c + 169 git checkout master + 170 $ git reset --hard + 171 git reset --hard + 172 git reset --hard + 173 git reset + 174 git status + 175 git revert + 176 git revert de8c13c + 177 git revert --continue + 178 git revert --continue + 179 git revert --continue + 180 git revert de8c13c + 181 git add/rm backup.sh.bak + 182 git add rm backup.sh.bak + 183 git add backup.sh.bak + 184 git revert de8c13c + 185 git stash + 186 git revert de8c13c + 187 git revert de8c13c + 188 git add backup.sh.bak + 189 git revert de8c13c + 190 git stash + 191 git revert de8c13c + 192 git mergetool + 193 echo "Как тебя зовут?" + 194 read name + 195 echo "Здравствуй, $name!" + 196 echo "Press any key to continue..." + 197 read -n 1 -s + 198 echo "" + 199 git reset HEAD~1~ + 200 git reset HEAD~2~ + 201 git reset HEAD~1~ + 202 git reset HEAD~4~ + 203 git log + 204 git commit + 205 git commit + 206 git commit + 207 git reset --hard HEAD de8c13cbd69fec7bb33f62d420a103dff2c40ef5 + 208 git reset --hard HEAD https://github.com/deks59rus/DPI-22-1_DO2.3-GitHub-.git~ + 209 git reset HEAD de8c13cbd69fec7bb33f62d420a103dff2c40ef5 + 210 git push -f origin master + 211 git checkout master + 212 git revert de8c13cbd69fec7bb33f62d420a103dff2c40ef5 + 213 git revert --abort + 214 git revert de8c13cbd69fec7bb33f62d420a103dff2c40ef5 + 215 git reset HEAD~4~ + 216 git push -f origin master + 217 git log + 218 history + 219 history > bash_history.txt + 220 python3 -m venv venv + 221 venv\Scripts\activate + 222 git check-ignore -v venv/ + 223 git status + 224 git brunch custom-brunch + 225 git branch custom-branch + 226 git checkout custom-branch + 227 git branch + 228 git add . + 229 git commit -m "В ветку добавлена программа HelloWorld на языке python" + 230 git status + 231 git add . + 232 git commit -m "Изменены программы для приветствия пользователя по имени" + 233 git checkout master + 234 git checkout custom-branch + 235 git checkout master + 236 git add . + 237 git status + 238 git add . + 239 git status + 240 git del . + 241 git status + 242 git commit -m "Изменены программы для приветствия пользователя по имени" + 243 git checkout custom-branch + 244 git merge custom-branch + 245 git checkout master + 246 git merge custom-branch + 247 git check-ignore -v venv/ + 248 git add .gitignore + 249 git add HelloWorld.java + 250 git status + 251 git commit -m "Разрешены конфликты merge" + 252 git status + 253 git tag -a v1.0.0 -m "Релиз версии 1.0.0" + 254 git push origin main + 255 git push + 256 git remote DPI_Lab2 + 257 git push origin master + 258 history > USER_HISTORY.txt diff --git a/backup.sh b/backup.sh new file mode 100644 index 00000000..86d32915 --- /dev/null +++ b/backup.sh @@ -0,0 +1,12 @@ + + + +echo "Как тебя зовут?" +read name + + +eho "Здравствуй, $name!" + +echo "Press any key to continue..." +read -n 1 -s +echo "" \ No newline at end of file From 09ea8bd83b6c2a55ccae3549cb89102e0493fc02 Mon Sep 17 00:00:00 2001 From: deks59rus Date: Mon, 11 Nov 2024 21:51:19 +0500 Subject: [PATCH 2/3] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- USER_HISTORY.txt | 119 +++++++++++++++++++++++++++++++++++++++++++++++ backup.sh | 12 +++++ backup.sh.bak | 12 +++++ 3 files changed, 143 insertions(+) create mode 100644 USER_HISTORY.txt create mode 100644 backup.sh create mode 100644 backup.sh.bak diff --git a/USER_HISTORY.txt b/USER_HISTORY.txt new file mode 100644 index 00000000..f7cd01bb --- /dev/null +++ b/USER_HISTORY.txt @@ -0,0 +1,119 @@ + + 141 cd ../git/test + 142 cd ./git/test + 143 git clone gh repo clone deks59rus/0_git_basics_DPI22-1 + 144 git clone gh repo clone "deks59rus/0_git_basics_DPI22-1" + 145 - + 146 git clone "deks59rus/0_git_basics_DPI22-1" + 147 git clone deks59rus/0_git_basics_DPI22-1 + 148 gh repo clone deks59rus/0_git_basics_DPI22-1 + 149 git repo clone deks59rus/0_git_basics_DPI22-1 + 150 git clone deks59rus/0_git_basics_DPI22-1 + 151 git@github.com:deks59rus/0_git_basics_DPI22-1.git + 152 git clone https://github.com/deks59rus/0_git_basics_DPI22-1.git + 153 git commit + 154 cd ./0_git_basics_DPI22-1 + 155 git commit + 156 git add --am + 157 git add all + 158 git add --all + 159 git status + 160 git commit + 161 echo "Как тебя зовут?" + 162 read name + 163 echo "Здравствуй, $name!" + 164 echo "Press any key to continue..." + 165 read -n 1 -s + 166 echo "" + 167 history + 168 git checkout de8c13c + 169 git checkout master + 170 $ git reset --hard + 171 git reset --hard + 172 git reset --hard + 173 git reset + 174 git status + 175 git revert + 176 git revert de8c13c + 177 git revert --continue + 178 git revert --continue + 179 git revert --continue + 180 git revert de8c13c + 181 git add/rm backup.sh.bak + 182 git add rm backup.sh.bak + 183 git add backup.sh.bak + 184 git revert de8c13c + 185 git stash + 186 git revert de8c13c + 187 git revert de8c13c + 188 git add backup.sh.bak + 189 git revert de8c13c + 190 git stash + 191 git revert de8c13c + 192 git mergetool + 193 echo "Как тебя зовут?" + 194 read name + 195 echo "Здравствуй, $name!" + 196 echo "Press any key to continue..." + 197 read -n 1 -s + 198 echo "" + 199 git reset HEAD~1~ + 200 git reset HEAD~2~ + 201 git reset HEAD~1~ + 202 git reset HEAD~4~ + 203 git log + 204 git commit + 205 git commit + 206 git commit + 207 git reset --hard HEAD de8c13cbd69fec7bb33f62d420a103dff2c40ef5 + 208 git reset --hard HEAD https://github.com/deks59rus/DPI-22-1_DO2.3-GitHub-.git~ + 209 git reset HEAD de8c13cbd69fec7bb33f62d420a103dff2c40ef5 + 210 git push -f origin master + 211 git checkout master + 212 git revert de8c13cbd69fec7bb33f62d420a103dff2c40ef5 + 213 git revert --abort + 214 git revert de8c13cbd69fec7bb33f62d420a103dff2c40ef5 + 215 git reset HEAD~4~ + 216 git push -f origin master + 217 git log + 218 history + 219 history > bash_history.txt + 220 python3 -m venv venv + 221 venv\Scripts\activate + 222 git check-ignore -v venv/ + 223 git status + 224 git brunch custom-brunch + 225 git branch custom-branch + 226 git checkout custom-branch + 227 git branch + 228 git add . + 229 git commit -m "В ветку добавлена программа HelloWorld на языке python" + 230 git status + 231 git add . + 232 git commit -m "Изменены программы для приветствия пользователя по имени" + 233 git checkout master + 234 git checkout custom-branch + 235 git checkout master + 236 git add . + 237 git status + 238 git add . + 239 git status + 240 git del . + 241 git status + 242 git commit -m "Изменены программы для приветствия пользователя по имени" + 243 git checkout custom-branch + 244 git merge custom-branch + 245 git checkout master + 246 git merge custom-branch + 247 git check-ignore -v venv/ + 248 git add .gitignore + 249 git add HelloWorld.java + 250 git status + 251 git commit -m "Разрешены конфликты merge" + 252 git status + 253 git tag -a v1.0.0 -m "Релиз версии 1.0.0" + 254 git push origin main + 255 git push + 256 git remote DPI_Lab2 + 257 git push origin master + 258 history > USER_HISTORY.txt diff --git a/backup.sh b/backup.sh new file mode 100644 index 00000000..e5af8ef1 --- /dev/null +++ b/backup.sh @@ -0,0 +1,12 @@ +# эта программа спрашивает имя пользователя, а затем здоровается с ним! + + +echo "Как тебя зовут?" +read name + + +echo "Здравствуй, $name!" + +echo "Press any key to continue..." +read -n 1 -s +echo "" \ No newline at end of file diff --git a/backup.sh.bak b/backup.sh.bak new file mode 100644 index 00000000..72a8e7b5 --- /dev/null +++ b/backup.sh.bak @@ -0,0 +1,12 @@ +# эта программа спрашивает имя пользователя, а затем здоровается с ним! + + +echo "Как тебя зовут?" +read name + + +eсho "Здравствуй, $name!" + +echo "Press any key to continue..." +read -n 1 -s +echo "" \ No newline at end of file From b2e04e159b38c04cee274cfdf1b9ffbfb4b9e208 Mon Sep 17 00:00:00 2001 From: deks59rus Date: Mon, 11 Nov 2024 22:00:48 +0500 Subject: [PATCH 3/3] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=BF=D0=B5=D1=80=D0=B2=D0=B0=D1=8F=20=D0=B7?= =?UTF-8?q?=D0=B0=D0=BF=D0=B8=D1=81=D1=8C=20=D0=B2=20newfile.txt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- newfile.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 newfile.txt diff --git a/newfile.txt b/newfile.txt new file mode 100644 index 00000000..5a07dbd8 --- /dev/null +++ b/newfile.txt @@ -0,0 +1 @@ +Первая запись