diff --git a/README.txt b/README.txt new file mode 100644 index 0000000..4bf7a0b --- /dev/null +++ b/README.txt @@ -0,0 +1,169 @@ + +kolya@Nikolay MINGW64 ~/Desktop/lab02 - Defense +$ mkdir DIR_1 + +kolya@Nikolay MINGW64 ~/Desktop/lab02 - Defense +$ cd DIR_1 + +kolya@Nikolay MINGW64 ~/Desktop/lab02 - Defense/DIR_1 +$ git init +Initialized empty Git repository in C:/Users/kolya/Desktop/lab02 - Defense/DIR_1/.git/ + +kolya@Nikolay MINGW64 ~/Desktop/lab02 - Defense/DIR_1 (master) +$ git branch -m main + +kolya@Nikolay MINGW64 ~/Desktop/lab02 - Defense/DIR_1 (main) +$ git config user.name 'Nick (KrivobokovNS)' + +kolya@Nikolay MINGW64 ~/Desktop/lab02 - Defense/DIR_1 (main) +$ git config user.email 'KrivobokovNS@mpei.ru' + +//Создал текстовый файл letters.txt и записал в него буквы a, b и c на разные строки. + +kolya@Nikolay MINGW64 ~/Desktop/lab02 - Defense/DIR_1 (main) +$ git add letters.txt + +kolya@Nikolay MINGW64 ~/Desktop/lab02 - Defense/DIR_1 (main) +$ git commit -m 'Добавлен текстовый файл' +[main (root-commit) ac0af54] Добавлен текстовый файл + 1 file changed, 3 insertions(+) + create mode 100644 letters.txt + +//В текстовом файле letters.txt удалил букву c и добавил буквы d, e и f на разные строки. + +kolya@Nikolay MINGW64 ~/Desktop/lab02 - Defense/DIR_1 (main) +$ git add letters.txt + +kolya@Nikolay MINGW64 ~/Desktop/lab02 - Defense/DIR_1 (main) +$ git commit -m 'Текстовый файл изменён' +[main e4a66c1] Текстовый файл изменён + 1 file changed, 3 insertions(+), 1 deletion(-) + +kolya@Nikolay MINGW64 ~/Desktop/lab02 - Defense/DIR_1 (main) +$ git show HEAD // Просмотрел содержимое последнего коммита. +commit e4a66c12e6cbcf2e6779e6ac8d62675896316258 (HEAD -> main) +Author: Nick (KrivobokovNS) +Date: Thu Jul 3 15:20:43 2025 +0300 + + Текстовый файл изменён + +diff --git a/letters.txt b/letters.txt +index 1c943a9..e62abb9 100644 +--- a/letters.txt ++++ b/letters.txt +@@ -1,3 +1,5 @@ + a + b +-c +\ No newline at end of file ++d ++e ++f +\ No newline at end of file + +//Создал новый репозитарий cs-lab02-defense на сайте и привязал его. + +kolya@Nikolay MINGW64 ~/Desktop/lab02 - Defense/DIR_1 (main) +$ git remote add origin git@uit.mpei.ru:KrivobokovNS/cs-lab02-defense.git + +kolya@Nikolay MINGW64 ~/Desktop/lab02 - Defense/DIR_1 (main) +$ git push -u origin main //Отправил коммиты на сервер. +Enumerating objects: 6, done. +Counting objects: 100% (6/6), done. +Delta compression using up to 16 threads +Compressing objects: 100% (2/2), done. +Writing objects: 100% (6/6), 533 bytes | 533.00 KiB/s, done. +Total 6 (delta 0), reused 0 (delta 0), pack-reused 0 (from 0) +remote: . Processing 1 references +remote: Processed 1 references in total +To uit.mpei.ru:KrivobokovNS/cs-lab02-defense.git + * [new branch] main -> main +branch 'main' set up to track 'origin/main'. + +kolya@Nikolay MINGW64 ~/Desktop/lab02 - Defense/DIR_1 (main) +$ cd .. + +kolya@Nikolay MINGW64 ~/Desktop/lab02 - Defense +$ git clone git@uit.mpei.ru:KrivobokovNS/cs-lab02-defense.git DIR_2 //Клонировал проект в отдельный каталог DIR_2. +Cloning into 'DIR_2'... +remote: Enumerating objects: 6, done. +remote: Counting objects: 100% (6/6), done. +remote: Compressing objects: 100% (2/2), done. +remote: Total 6 (delta 0), reused 0 (delta 0), pack-reused 0 +Receiving objects: 100% (6/6), done. + +kolya@Nikolay MINGW64 ~/Desktop/lab02 - Defense +$ cd DIR_2 + +kolya@Nikolay MINGW64 ~/Desktop/lab02 - Defense/DIR_2 (main) // +$ git config user.name 'John (KrivobokovNS)' // + // Настроил имя и почту для второго каталога. +kolya@Nikolay MINGW64 ~/Desktop/lab02 - Defense/DIR_2 (main) // +$ git config user.email 'KrivobokovNS@mpei.ru' // + +//В текстовом файле letters.txt добавил буквы g и h на разные строки. + +kolya@Nikolay MINGW64 ~/Desktop/lab02 - Defense/DIR_2 (main) +$ git add letters.txt + +kolya@Nikolay MINGW64 ~/Desktop/lab02 - Defense/DIR_2 (main) +$ git commit -m 'Добавлены g и h' +[main 1ec6137] Добавлены g и h + 1 file changed, 3 insertions(+), 1 deletion(-) + +kolya@Nikolay MINGW64 ~/Desktop/lab02 - Defense/DIR_2 (main) +$ git push //Отправил изменения на сервер. +Enumerating objects: 5, done. +Counting objects: 100% (5/5), done. +Writing objects: 100% (3/3), 292 bytes | 292.00 KiB/s, done. +Total 3 (delta 0), reused 0 (delta 0), pack-reused 0 (from 0) +remote: . Processing 1 references +remote: Processed 1 references in total +To uit.mpei.ru:KrivobokovNS/cs-lab02-defense.git + e4a66c1..1ec6137 main -> main + +kolya@Nikolay MINGW64 ~/Desktop/lab02 - Defense/DIR_2 (main) +$ cd .. + +kolya@Nikolay MINGW64 ~/Desktop/lab02 - Defense +$ cd DIR_1 //Вернулся в исходный репозитарий. + +kolya@Nikolay MINGW64 ~/Desktop/lab02 - Defense/DIR_1 (main) +$ git fetch +remote: Enumerating objects: 5, done. +remote: Counting objects: 100% (5/5), done. +remote: Total 3 (delta 0), reused 0 (delta 0), pack-reused 0 +Unpacking objects: 100% (3/3), 272 bytes | 34.00 KiB/s, done. +From uit.mpei.ru:KrivobokovNS/cs-lab02-defense + e4a66c1..1ec6137 main -> origin/main + +kolya@Nikolay MINGW64 ~/Desktop/lab02 - Defense/DIR_1 (main) +$ git log --oneline --decorate -- all --graph + +kolya@Nikolay MINGW64 ~/Desktop/lab02 - Defense/DIR_1 (main) +$ git log --oneline --decorate --all --graph +* 1ec6137 (origin/main, origin/HEAD) Добавлены g и h +* e4a66c1 (HEAD -> main) Текстовый файл изменён +* ac0af54 Добавлен текстовый файл + +kolya@Nikolay MINGW64 ~/Desktop/lab02 - Defense/DIR_1 (main) +$ git pull --ff-only //Скачал новую версию истории с сервера. +Updating e4a66c1..1ec6137 +Fast-forward + letters.txt | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +kolya@Nikolay MINGW64 ~/Desktop/lab02 - Defense/DIR_1 (main) +$ git merge origin +Already up to date. + +kolya@Nikolay MINGW64 ~/Desktop/lab02 - Defense/DIR_1 (main) +$ git merge origin/main +Already up to date. + +kolya@Nikolay MINGW64 ~/Desktop/lab02 - Defense/DIR_1 (main) +$ git merge HEAD +Already up to date. + +kolya@Nikolay MINGW64 ~/Desktop/lab02 - Defense/DIR_1 (main) +$