From d2116cdb0572aff8106e0b2eaa0e1771c6f9794f Mon Sep 17 00:00:00 2001 From: "Alice (KislovAG)" Date: Mon, 3 Apr 2023 01:10:43 +0300 Subject: [PATCH] report --- report.txt | 1022 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 1022 insertions(+) create mode 100644 report.txt diff --git a/report.txt b/report.txt new file mode 100644 index 0000000..1a52cf1 --- /dev/null +++ b/report.txt @@ -0,0 +1,1022 @@ +Отчет по лабораторной работе № 2 "Система контроля версий Git" + +Выполнил: Кислов А.Г. +Группа: А-03-22 +Проверил: + +Примечание: работа выполнялась на Windows. + +1. Создал на рабочем столе каталог lab02 и запустил в нем Git Bash, приглашение: + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02 +$ + + + +2. Просмотрел файлы в рабочем каталоге можно командой "ls" --- пусто: + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02 +$ls + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02 +$ + +3. Создал каталоги Алисы и Боба, создал каталог "project", +изучил команду "cd" в процессе: + +ivan@HOME-PC MINGW32 /c/Users/ivan/Desktop/lab02 +$ mkdir alice + +ivan@HOME-PC MINGW32 /c/Users/ivan/Desktop/lab02 +$ mkdir bob + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02 +$ cd alice + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice +$ mkdir project + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice +$ cd project + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project +$ cd .. + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice +$ cd .. + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02 +$ cd alice + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice +$ cd project + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project +$ ls + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project +$ + +4. Инициализировал репозитарий: + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project +$ git init +Initialized empty Git repository in C:/Users/Артем/OneDrive/Рабочий стол/lab02/alice/project/.git/ + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master) +$ ls -A +.git/ + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master) +$ git config user.name 'Alice (KislovArG)' + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master) +$ git config user.email 'kislovartem12@gmail.com' + +имя ветки буду менять после создания первго коммита + +5. Создание коммитов: + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master) +$ git status +On branch master + +No commits yet + +Untracked files: + (use "git add ..." to include in what will be committed) + bin/ + main.cpp + obj/ + project.cbp + +nothing added to commit but untracked files present (use "git add" to track) + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master) +$ git add main.cpp + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master) +$ git status +On branch master + +No commits yet + +Changes to be committed: + (use "git rm --cached ..." to unstage) + new file: main.cpp + +Untracked files: + (use "git add ..." to include in what will be committed) + bin/ + obj/ + project.cbp + +при первом статусе у нас отобразились файлы которые не занесены под Git, далее мы занесли под Git main + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master) +$ git commit -m 'code: заготовка программы' +[master (root-commit) 99e4b56] code: заготовка программы + 1 file changed, 9 insertions(+) + create mode 100644 main.cpp + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master) +$ git branch -m main + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ git add project.cbp +warning: in the working copy of 'project.cbp', LF will be replaced by CRLF the next time Git touches it + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ git commit -m 'build: добавлен файл проекта' +[main 52122b5] build: добавлен файл проекта + 1 file changed, 40 insertions(+) + create mode 100644 project.cbp + +6. Создание коммитов с изменениями: + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ git status +On branch main +Changes not staged for commit: + (use "git add ..." to update what will be committed) + (use "git restore ..." to discard changes in working directory) + modified: main.cpp + +Untracked files: + (use "git add ..." to include in what will be committed) + bin/ + obj/ + +no changes added to commit (use "git add" and/or "git commit -a") + +показывает что были изменения но мы не зафиксировали их + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ git add main.cpp + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ git commit -m "code: ввод двух чисел" +[main 8026dda] code: ввод двух чисел + 1 file changed, 4 insertions(+), 2 deletions(-) + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ git add -u + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ git commit -m "code: вывод суммы a и b" +[main 8b9b7ad] code: вывод суммы a и b + 1 file changed, 1 insertion(+) + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ git commit -a -m "code: вывод разности a и b" +[main fb9dba9] code: вывод разности a и b + 1 file changed, 2 insertions(+), 1 deletion(-) + +7. Игнорирование файлов + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ git status +On branch main +Untracked files: + (use "git add ..." to include in what will be committed) + .gitignore + obj/ + project.depend + +nothing added to commit but untracked files present (use "git add" to track) + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ git status +On branch main +Untracked files: + (use "git add ..." to include in what will be committed) + .gitignore + project.depend + +nothing added to commit but untracked files present (use "git add" to track) + +игнорируем файлы и создаем коммит + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ git add .gitignore + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ git commit -m "git: игнорирование файлов" +[main ee1d9a6] git: игнорирование файлов + 1 file changed, 2 insertions(+) + create mode 100644 .gitignore + +8.Просмотр истории + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ git log --stat +commit ee1d9a6d4cac2409bfedac53bef688c7736bfd28 (HEAD -> main) +Author: Alice (KislovArG) +Date: Mon Mar 20 00:34:47 2023 +0300 + + git: игнорирование файлов + + .gitignore | 2 ++ + 1 file changed, 2 insertions(+) + +commit fb9dba922db44d203eca11b2d245f952c72cf2cd +Author: Alice (KislovArG) +Date: Mon Mar 20 00:23:59 2023 +0300 + + code: вывод разности a и b + + main.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 8b9b7adf13edbd20b6803de684e1cf14d8b3e6b3 +Author: Alice (KislovArG) +Date: Mon Mar 20 00:22:23 2023 +0300 + + code: вывод суммы a и b + +послелдний коммит показывает сколько файлов изменено и сколько вставок сделано + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ git log --oneline --decorate +ee1d9a6 (HEAD -> main) git: игнорирование файлов +fb9dba9 code: вывод разности a и b +8b9b7ad code: вывод суммы a и b +8026dda code: ввод двух чисел +52122b5 build: добавлен файл проекта +99e4b56 code: заготовка программы + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ git log --oneline --decorate --all --graph +* ee1d9a6 (HEAD -> main) git: игнорирование файлов +* fb9dba9 code: вывод разности a и b +* 8b9b7ad code: вывод суммы a и b +* 8026dda code: ввод двух чисел +* 52122b5 build: добавлен файл проекта +* 99e4b56 code: заготовка программы + +найдем коммит по теме build, а затем коммиты затрагивающие project.cbp + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ git log -- project.cbp +commit 52122b516f59108cdf1bf80d1a7b51f07dd39e49 +Author: Alice (KislovArG) +Date: Mon Mar 20 00:13:34 2023 +0300 + + build: добавлен файл проекта + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ git log --grep "build:" +commit 52122b516f59108cdf1bf80d1a7b51f07dd39e49 +Author: Alice (KislovArG) +Date: Mon Mar 20 00:13:34 2023 +0300 + + build: добавлен файл проекта + +9.Просмотр коммитов + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ git diff +diff --git a/main.cpp b/main.cpp +index 3ec5517..11e84f5 100644 +--- a/main.cpp ++++ b/main.cpp +@@ -8,6 +8,7 @@ int main() + int a, b; + cin >> a >> b; + cout << "A + B = " << a + b << '\n' +- << "A - B = " << a - b << '\n'; ++ << "A - B = " << a - b << '\n' ++ << "A * B = " << a * b << '\n'; + + } + + нам показали что А-B строка изменилась и что добавилась строка A*B(сравнил версию до изменения и после) + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ git diff HEAD~2 +diff --git a/.gitignore b/.gitignore +new file mode 100644 +index 0000000..4c7473d +--- /dev/null ++++ b/.gitignore +@@ -0,0 +1,2 @@ ++/bin ++/obj +diff --git a/main.cpp b/main.cpp +index 1967dd8..11e84f5 100644 +--- a/main.cpp ++++ b/main.cpp +@@ -7,6 +7,8 @@ int main() + cout << "Enter A and B: "; + int a, b; + cin >> a >> b; +- cout << "A + B = " << a + b << '\n'; ++ cout << "A + B = " << a + b << '\n' ++ << "A - B = " << a - b << '\n' ++ << "A * B = " << a * b << '\n'; + + } + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ git diff HEAD~2 HEAD +diff --git a/.gitignore b/.gitignore +new file mode 100644 +index 0000000..4c7473d +--- /dev/null ++++ b/.gitignore +@@ -0,0 +1,2 @@ ++/bin ++/obj +diff --git a/main.cpp b/main.cpp +index 1967dd8..3ec5517 100644 +--- a/main.cpp ++++ b/main.cpp +@@ -7,6 +7,7 @@ int main() + cout << "Enter A and B: "; + int a, b; + cin >> a >> b; +- cout << "A + B = " << a + b << '\n'; ++ cout << "A + B = " << a + b << '\n' ++ << "A - B = " << a - b << '\n'; + + } + + + изменение между 1 коммитом и коммитом добавляющим вывод разности + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ git diff HEAD~1 HEAD~5 +diff --git a/main.cpp b/main.cpp +index 3ec5517..b4392ec 100644 +--- a/main.cpp ++++ b/main.cpp +@@ -4,10 +4,6 @@ using namespace std; + + int main() + { +- cout << "Enter A and B: "; +- int a, b; +- cin >> a >> b; +- cout << "A + B = " << a + b << '\n' +- << "A - B = " << a - b << '\n'; +- ++ cout << "Hello world!" << endl; ++ return 0; + } +diff --git a/project.cbp b/project.cbp +deleted file mode 100644 +index 99bb702..0000000 +--- a/project.cbp ++++ /dev/null +@@ -1,40 +0,0 @@ + +10.Откат изменений + добавим коммит произведения + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ git add main.cpp + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ git commit -m"code: вывод произведения a и b" +[main 6f27c06] code: вывод произведения a и b + 1 file changed, 2 insertions(+), 1 deletion(-) + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ git reset --hard HEAD~1 +HEAD is now at ee1d9a6 git: игнорирование файлов + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ git checkout HEAD -- main.cpp + + +11.Обмен кодом через удаленное хранилище +Настройка ssh + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ ssh-keygen +Generating public/private rsa key pair. +Enter file in which to save the key (/c/Users/Артем/.ssh/id_rsa): +Created directory '/c/Users/\320\220\321\200\321\202\320\265\320\274/.ssh'. +Enter passphrase (empty for no passphrase): +Enter same passphrase again: +Your identification has been saved in /c/Users/Артем/.ssh/id_rsa +Your public key has been saved in /c/Users/Артем/.ssh/id_rsa.pub +The key fingerprint is: +SHA256:CQLV1PxKK87GRXwc9kAfXDytdHt9QZrv7AMjxlR3Eto Артем@LAPTOP-05DPLC18 +The key's randomart image is: ++---[RSA 3072]----+ +| ...o.o ....o++ | +| . . o +..=Bo+| +| . .. + +++E==| +| . .+.+.. o.+| +| oS+o .o| +| . + + oo | +| + o . . oo | +| = .. | +| . ..| ++----[SHA256]-----+ + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ eval $(ssh-agent -s) +Agent pid 472 + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ ssh-add +Enter passphrase for /c/Users/Артем/.ssh/id_rsa: +Identity added: /c/Users/Артем/.ssh/id_rsa (Артем@LAPTOP-05DPLC18) + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ cat ~/.ssh/id_rsa.pub +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDvSlBsANyM7j5I7zdlV6rKgMThMNX9v8/zW3wHR/kCnI7OQo/JOEFd6dHZBZkvz1sBHxCPHD7rwzsFj1uYpEYnfXbtrVT0frHhkPc0fs0YuuOSle4JAyq5qi4WFHMWF0Ex2ZO+S8IO9dMXBLg4mmy8LOEwAHBM8kg8d2cJlX0oeKg9iehRJ/x2LKeOPL+YkmRDUxPhI7utXJ6kfAQK9nmSBPXZeZeK8aNDqj4HPY9b48ZrTVL5RAUfGo3ok2sPtNOq+zSZkmEF0+28nR0ePw59DMCXDhxuGX1h4mJSP7TgudZR0CcaW8KGZg8Ii5InhZxsHIGIKrrKH+Aw4uoOhsufjq8buc09JorWhbigSR47+K44r3xub1EaBlfTz+gUazAnvUaMPecg0H6id4tOXgyLzGprt+/VuqsQWjZamSDOc40C5x0Ebz/FQ0i7eooUWg4Z4dNiQR9FX64yQnkkE8qdsQAt+bueFjo/oQUJPIOuvhcCzBuUpGoJaD8sx3oTlHc= Артем@LAPTOP-05DPLC18 + +Отправка проекта на сервер +Получение проекта с сервера + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ touch README.md + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ git init +Reinitialized existing Git repository in C:/Users/Артем/OneDrive/Рабочий стол/lab02/alice/project/.git/ + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ git checkout -b main +fatal: a branch named 'main' already exists + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ git add README.md + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ git commit -m "first commit" +[main 53c4b6b] first commit + 1 file changed, 0 insertions(+), 0 deletions(-) + create mode 100644 README.md + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ git remote add origin git@uit.mpei.ru:KislovAG/cs-lab02-v2.git + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ git push -u origin main +The authenticity of host 'uit.mpei.ru (193.233.68.149)' can't be established. +ED25519 key fingerprint is SHA256:Q5w0UKEzQKA3J6NyMtjwCLvtAykoxdugIXjx6NwU4NA. +This key is not known by any other names. +Are you sure you want to continue connecting (yes/no/[fingerprint])? +Host key verification failed. +fatal: Could not read from remote repository. + +Please make sure you have the correct access rights +and the repository exists. + +ошибочно сделал верхнюю инструкцию + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ git push -u origin main +The authenticity of host 'uit.mpei.ru (193.233.68.149)' can't be established. +ED25519 key fingerprint is SHA256:Q5w0UKEzQKA3J6NyMtjwCLvtAykoxdugIXjx6NwU4NA. +This key is not known by any other names. +Are you sure you want to continue connecting (yes/no/[fingerprint])? yes +Warning: Permanently added 'uit.mpei.ru' (ED25519) to the list of known hosts. +Enumerating objects: 21, done. +Counting objects: 100% (21/21), done. +Delta compression using up to 8 threads +Compressing objects: 100% (18/18), done. +Writing objects: 100% (21/21), 2.56 KiB | 187.00 KiB/s, done. +Total 21 (delta 3), reused 0 (delta 0), pack-reused 0 +remote: . Processing 1 references +remote: Processed 1 references in total +To uit.mpei.ru:KislovAG/cs-lab02-v2.git + * [new branch] main -> main +branch 'main' set up to track 'origin/main'. + + +12. Получение проекта с сервера + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ git remote -v +origin git@uit.mpei.ru:KislovAG/cs-lab02-v2.git (fetch) +origin git@uit.mpei.ru:KislovAG/cs-lab02-v2.git (push) + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/bob +$ git clone git@uit.mpei.ru:KislovAG/cs-lab02-v2.git project +Cloning into 'project'... +Enter passphrase for key '/c/Users/Артем/.ssh/id_rsa': +remote: Enumerating objects: 21, done. +remote: Counting objects: 100% (21/21), done. +remote: Compressing objects: 100% (18/18), done. +remote: Total 21 (delta 3), reused 0 (delta 0), pack-reused 0 +Receiving objects: 100% (21/21), done. +Resolving deltas: 100% (3/3), done. + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/bob +$ cd project + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/bob/project (main) +$ git config user.name 'bob (KislovArG)' + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/bob/project (main) +$ git config user.email 'kislovartem12@gmail.com' + +настраивали конфиг боба + +13. Совместная работа над проектом без конфликтов правок + +коммит на машине боба + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/bob/project (main) +$ git config user.name 'Bob (KislovArG)' + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/bob/project (main) +$ git config user.email 'kislovartem12@gmail.com' + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/bob/project (main) +$ git add main.cpp + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/bob/project (main) +$ git commit -m "code: вывод произведения a и b" +[main 03572ea] code: вывод произведения a и b + 1 file changed, 1 insertion(+), 2 deletions(-) + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/bob/project (main) +$ git log +commit 03572ea0c1f2885317d6fb355ad9d5f07b89da63 (HEAD -> main) +Author: Bob (KislovArG) +Date: Mon Mar 20 02:42:03 2023 +0300 + + code: вывод произведения a и b + +commit c45cee44176896bcdda0ead364eee9a0bc2006d8 (origin/main, origin/HEAD) +Author: Alice (KislovArG) +Date: Mon Mar 20 02:08:08 2023 +0300 + + code:вывод произведения a и b + +commit 53c4b6b4efa1047be9cf1b470a794737dad2d45c +Author: Alice (KislovArG) +Date: Mon Mar 20 01:24:46 2023 +0300 + + first commit + +commit ee1d9a6d4cac2409bfedac53bef688c7736bfd28 +Author: Alice (KislovArG) +Date: Mon Mar 20 00:34:47 2023 +0300 + + git: игнорирование файлов + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/bob/project (main) +$ git push +Enter passphrase for key '/c/Users/Артем/.ssh/id_rsa': +Enumerating objects: 5, done. +Counting objects: 100% (5/5), done. +Delta compression using up to 8 threads +Compressing objects: 100% (3/3), done. +Writing objects: 100% (3/3), 338 bytes | 169.00 KiB/s, done. +Total 3 (delta 2), reused 0 (delta 0), pack-reused 0 +remote: . Processing 1 references +remote: Processed 1 references in total +To uit.mpei.ru:KislovAG/cs-lab02-v2.git + c45cee4..03572ea main -> main + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ git fetch +remote: Enumerating objects: 5, done. +remote: Counting objects: 100% (5/5), done. +remote: Compressing objects: 100% (3/3), done. +remote: Total 3 (delta 2), reused 0 (delta 0), pack-reused 0 +Unpacking objects: 100% (3/3), 318 bytes | 6.00 KiB/s, done. +From uit.mpei.ru:KislovAG/cs-lab02-v2 + c45cee4..03572ea main -> origin/main + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ git log --oneline --decorate --all --graph +* 03572ea (origin/main) code: вывод произведения a и b +* c45cee4 code:вывод произведения a и b +* 53c4b6b (HEAD -> main) first commit +* ee1d9a6 git: игнорирование файлов +* fb9dba9 code: вывод разности a и b +* 8b9b7ad code: вывод суммы a и b +* 8026dda code: ввод двух чисел +* 52122b5 build: добавлен файл проекта +* 99e4b56 code: заготовка программы + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ git pull --ff-only +Updating 53c4b6b..03572ea +Fast-forward + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ git log --oneline --decorate --all --graph +* 03572ea (HEAD -> main, origin/main) code: вывод произведения a и b +* c45cee4 code:вывод произведения a и b +* 53c4b6b first commit +* ee1d9a6 git: игнорирование файлов +* fb9dba9 code: вывод разности a и b +* 8b9b7ad code: вывод суммы a и b +* 8026dda code: ввод двух чисел +* 52122b5 build: добавлен файл проекта +* 99e4b56 code: заготовка программы + +делаем коммит как алиса + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ git add main.cpp + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ git commit -m "code: вывод деления a и b" +[main e977940] code: вывод деления a и b + 1 file changed, 5 insertions(+), 2 deletions(-) + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ пше дщп +bash: пше: command not found + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ git log +commit e97794052e8bafc10a59ca49ea45ec6e1c97dee8 (HEAD -> main) +Author: Alice (KislovArG) +Date: Mon Mar 20 02:48:21 2023 +0300 + + code: вывод деления a и b + +commit 03572ea0c1f2885317d6fb355ad9d5f07b89da63 (origin/main) +Author: Bob (KislovArG) +Date: Mon Mar 20 02:42:03 2023 +0300 + + code: вывод произведения a и b + +commit c45cee44176896bcdda0ead364eee9a0bc2006d8 +Author: Alice (KislovArG) +Date: Mon Mar 20 02:08:08 2023 +0300 + + code:вывод произведения a и b + +commit 53c4b6b4efa1047be9cf1b470a794737dad2d45c +Author: Alice (KislovArG) + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ git push +Enumerating objects: 5, done. +Counting objects: 100% (5/5), done. +Delta compression using up to 8 threads +Compressing objects: 100% (3/3), done. +Writing objects: 100% (3/3), 406 bytes | 135.00 KiB/s, done. +Total 3 (delta 2), reused 0 (delta 0), pack-reused 0 +remote: . Processing 1 references +remote: Processed 1 references in total +To uit.mpei.ru:KislovAG/cs-lab02-v2.git + 03572ea..e977940 main -> main + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/bob/project (main) +$ git push +Enter passphrase for key '/c/Users/Артем/.ssh/id_rsa': +Enumerating objects: 5, done. +Counting objects: 100% (5/5), done. +Delta compression using up to 8 threads +Compressing objects: 100% (3/3), done. +Writing objects: 100% (3/3), 338 bytes | 169.00 KiB/s, done. +Total 3 (delta 2), reused 0 (delta 0), pack-reused 0 +remote: . Processing 1 references +remote: Processed 1 references in total +To uit.mpei.ru:KislovAG/cs-lab02-v2.git + c45cee4..03572ea main -> main + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/bob/project (main) +$ git fetch +Enter passphrase for key '/c/Users/Артем/.ssh/id_rsa': +remote: Enumerating objects: 5, done. +remote: Counting objects: 100% (5/5), done. +remote: Compressing objects: 100% (3/3), done. +remote: Total 3 (delta 2), reused 0 (delta 0), pack-reused 0 +Unpacking objects: 100% (3/3), 386 bytes | 8.00 KiB/s, done. +From uit.mpei.ru:KislovAG/cs-lab02-v2 + 03572ea..e977940 main -> origin/main + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/bob/project (main) +$ git log --oneline --decorate --all --graph +* e977940 (origin/main, origin/HEAD) code: вывод деления a и b +* 03572ea (HEAD -> main) code: вывод произведения a и b +* c45cee4 code:вывод произведения a и b +* 53c4b6b first commit +* ee1d9a6 git: игнорирование файлов +* fb9dba9 code: вывод разности a и b +* 8b9b7ad code: вывод суммы a и b +* 8026dda code: ввод двух чисел +* 52122b5 build: добавлен файл проекта +* 99e4b56 code: заготовка программы + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/bob/project (main) +$ git pull --ff-only +Enter passphrase for key '/c/Users/Артем/.ssh/id_rsa': +error: Your local changes to the following files would be overwritten by merge: + main.cpp +Please commit your changes or stash them before you merge. +Aborting +Updating 03572ea..e977940 + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/bob/project (main) +$ git log --oneline --decorate --all --graph +* e977940 (origin/main, origin/HEAD) code: вывод деления a и b +* 03572ea (HEAD -> main) code: вывод произведения a и b +* c45cee4 code:вывод произведения a и b +* 53c4b6b first commit +* ee1d9a6 git: игнорирование файлов +* fb9dba9 code: вывод разности a и b +* 8b9b7ad code: вывод суммы a и b +* 8026dda code: ввод двух чисел +* 52122b5 build: добавлен файл проекта +* 99e4b56 code: заготовка программы + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/bob/project (main) +$ git pull --ff-only +Enter passphrase for key '/c/Users/Артем/.ssh/id_rsa': +error: Your local changes to the following files would be overwritten by merge: + main.cpp +Please commit your changes or stash them before you merge. +Aborting +Updating 03572ea..e977940 + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/bob/project (main) +$ git log --oneline --decorate --all --graph +* e977940 (origin/main, origin/HEAD) code: вывод деления a и b +* 03572ea (HEAD -> main) code: вывод произведения a и b +* c45cee4 code:вывод произведения a и b +* 53c4b6b first commit +* ee1d9a6 git: игнорирование файлов +* fb9dba9 code: вывод разности a и b +* 8b9b7ad code: вывод суммы a и b +* 8026dda code: ввод двух чисел +* 52122b5 build: добавлен файл проекта +* 99e4b56 code: заготовка программы + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/bob/project (main) +$ git fetch +Enter passphrase for key '/c/Users/Артем/.ssh/id_rsa': + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/bob/project (main) +$ git pull --ff-only +Enter passphrase for key '/c/Users/Артем/.ssh/id_rsa': +error: Your local changes to the following files would be overwritten by merge: + main.cpp +Please commit your changes or stash them before you merge. +Aborting +Updating 03572ea..e977940 + + + +14. Использование веток + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ git branch double + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ git checkout double +Switched to branch 'double' + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (double) +$ git add main.cpp + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (double) +$ git commit -m "code: изменение типа a и b" +[double f90c9df] code: изменение типа a и b + 1 file changed, 1 insertion(+), 1 deletion(-) + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (double) +$ git checkout main +Switched to branch 'main' +Your branch is up to date with 'origin/main'. + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ git fetch main +fatal: 'main' does not appear to be a git repository +fatal: Could not read from remote repository. + +Please make sure you have the correct access rights +and the repository exists. + + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ git push -u origin main +Enter passphrase for key '/c/Users/Артем/.ssh/id_rsa': +To uit.mpei.ru:KislovAG/cs-lab02_3.git + ! [rejected] main -> main (fetch first) +error: failed to push some refs to 'uit.mpei.ru:KislovAG/cs-lab02_3.git' +hint: Updates were rejected because the remote contains work that you do +hint: not have locally. This is usually caused by another repository pushing +hint: to the same ref. You may want to first integrate the remote changes +hint: (e.g., 'git pull ...') before pushing again. +hint: See the 'Note about fast-forwards' in 'git push --help' for details. + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ git checkout main +Already on 'main' +Your branch is ahead of 'origin/main' by 1 commit. + (use "git push" to publish your local commits) + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ git checkout double +Switched to branch 'double' + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (double) +$ git add main.cpp + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (double) +$ git commit -m "code: изменение типа переменных a и b" +On branch double +Untracked files: + (use "git add ..." to include in what will be committed) + main.exe + main.o + project.cbp + project.depend + project.layout + +nothing added to commit but untracked files present (use "git add" to track) + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (double) +$ git add main.cpp + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (double) +$ git commit "code: изменение типа переменных" +error: pathspec 'code: изменение типа переменных' did not match any file(s) known to git + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (double) +$ git commit -m "code: изменение типа переменных" +On branch double +Untracked files: + (use "git add ..." to include in what will be committed) + main.exe + main.o + project.cbp + project.depend + project.layout + +nothing added to commit but untracked files present (use "git add" to track) + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (double) +$ checkout main +bash: checkout: command not found + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (double) +$ git checkout main +Switched to branch 'main' +Your branch is ahead of 'origin/main' by 1 commit. + (use "git push" to publish your local commits) + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ git push +Enter passphrase for key '/c/Users/Артем/.ssh/id_rsa': +To uit.mpei.ru:KislovAG/cs-lab02_3.git + ! [rejected] main -> main (fetch first) +error: failed to push some refs to 'uit.mpei.ru:KislovAG/cs-lab02_3.git' +hint: Updates were rejected because the remote contains work that you do +hint: not have locally. This is usually caused by another repository pushing +hint: to the same ref. You may want to first integrate the remote changes +hint: (e.g., 'git pull ...') before pushing again. +hint: See the 'Note about fast-forwards' in 'git push --help' for details. + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ git merge double +Already up to date. + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ git fetch double +fatal: 'double' does not appear to be a git repository +fatal: Could not read from remote repository. + +Please make sure you have the correct access rights +and the repository exists. + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ git fetch main +fatal: 'main' does not appear to be a git repository +fatal: Could not read from remote repository. + +Please make sure you have the correct access rights +and the repository exists. + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ git log --oneline --decorate --all --graph +* f90c9df (HEAD -> main, double) code: изменение типа a и b +* 77540fd (origin/main) code: вывод максимума a и b +* d10adf4 code: вывод деления a и b +* ed1e84d code: вывод произведения a и b +* e25809b git: игнорирование файлов +* 66ee07e code: вывод разности a и b +* d19e54d code: вывод суммы a и b +* 3b26f59 code: ввод a и b +* 219751c code: заготовка программы + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ git push -u origin main +Enter passphrase for key '/c/Users/Артем/.ssh/id_rsa': +To uit.mpei.ru:KislovAG/cs-lab02_3.git + ! [rejected] main -> main (fetch first) +error: failed to push some refs to 'uit.mpei.ru:KislovAG/cs-lab02_3.git' +hint: Updates were rejected because the remote contains work that you do +hint: not have locally. This is usually caused by another repository pushing +hint: to the same ref. You may want to first integrate the remote changes +hint: (e.g., 'git pull ...') before pushing again. +hint: See the 'Note about fast-forwards' in 'git push --help' for details. + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ git pull --ff-only + +Enter passphrase for key '/c/Users/Артем/.ssh/id_rsa': +git@uit.mpei.ru's password: +Permission denied, please try again. +git@uit.mpei.ru's password: +Permission denied, please try again. +git@uit.mpei.ru's password: +git@uit.mpei.ru: Permission denied (publickey,password). +fatal: Could not read from remote repository. + +Please make sure you have the correct access rights +and the repository exists. + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ git log --oneline --decorate --all --graph +* f90c9df (HEAD -> main, double) code: изменение типа a и b +* 77540fd (origin/main) code: вывод максимума a и b +* d10adf4 code: вывод деления a и b +* ed1e84d code: вывод произведения a и b +* e25809b git: игнорирование файлов +* 66ee07e code: вывод разности a и b +* d19e54d code: вывод суммы a и b +* 3b26f59 code: ввод a и b +* 219751c code: заготовка программы + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ git fetch origin main:tmp +Enter passphrase for key '/c/Users/Артем/.ssh/id_rsa': +remote: Enumerating objects: 5, done. +remote: Counting objects: 100% (5/5), done. +remote: Compressing objects: 100% (3/3), done. +remote: Total 3 (delta 1), reused 0 (delta 0), pack-reused 0 +Unpacking objects: 100% (3/3), 369 bytes | 30.00 KiB/s, done. +From uit.mpei.ru:KislovAG/cs-lab02_3 + * [new branch] main -> tmp + 77540fd..4481f0c main -> origin/main + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ git rebase tmp +Successfully rebased and updated refs/heads/main. + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ git push +Enter passphrase for key '/c/Users/Артем/.ssh/id_rsa': +Enumerating objects: 5, done. +Counting objects: 100% (5/5), done. +Delta compression using up to 8 threads +Compressing objects: 100% (3/3), done. +Writing objects: 100% (3/3), 363 bytes | 363.00 KiB/s, done. +Total 3 (delta 1), reused 0 (delta 0), pack-reused 0 +remote: . Processing 1 references +remote: Processed 1 references in total +To uit.mpei.ru:KislovAG/cs-lab02_3.git + 4481f0c..66802bc main -> main + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ git log --oneline --decorate --all --graph +* 66802bc (HEAD -> main, origin/main) code: изменение типа a и b +* 4481f0c (tmp) code: вывод минимума a и b +| * f90c9df (double) code: изменение типа a и b +|/ +* 77540fd code: вывод максимума a и b +* d10adf4 code: вывод деления a и b +* ed1e84d code: вывод произведения a и b +* e25809b git: игнорирование файлов +* 66ee07e code: вывод разности a и b +* d19e54d code: вывод суммы a и b +* 3b26f59 code: ввод a и b +* 219751c code: заготовка программы + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ git checkout main +Already on 'main' +Your branch is up to date with 'origin/main'. + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ git merge double +Auto-merging main.cpp +hint: Waiting for your editor to close the file... 0 [sig] bash 3277! sigpacket::process: Suppressing signal 18 to win32 process (pid 12776) + 448743 [sig] bash 3277! sigpacket::process: Suppressing signal 18 to win32 process (pid 12776) + 3727688 [sig] bash 3277! sigpacket::process: Suppressing signal 18 to win32 process (pid 12776) + 3997370 [sig] bash 3277! sigpacket::process: Suppressing signal 18 to win32 process (pid 12776) +Merge made by the 'ort' strategy. + +Артем@LAPTOP-05DPLC18 MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main) +$ git push +Enter passphrase for key '/c/Users/Артем/.ssh/id_rsa': +Enumerating objects: 8, done. +Counting objects: 100% (8/8), done. +Delta compression using up to 8 threads +Compressing objects: 100% (4/4), done. +Writing objects: 100% (4/4), 555 bytes | 555.00 KiB/s, done. +Total 4 (delta 1), reused 0 (delta 0), pack-reused 0 +remote: . Processing 1 references +remote: Processed 1 references in total +To uit.mpei.ru:KislovAG/cs-lab02_3.git + 66802bc..6e564f8 main -> main + + + +