From 494406b9506756e49583429ca0b6400ab6006795 Mon Sep 17 00:00:00 2001 From: "Alice (VinogradovMA)" Date: Fri, 4 Apr 2025 11:45:02 +0300 Subject: [PATCH] report+depend --- project.cbp | 5 - project.depend | 4 + report.txt | 1031 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1035 insertions(+), 5 deletions(-) create mode 100644 project.depend create mode 100644 report.txt diff --git a/project.cbp b/project.cbp index f7d7e07..99bb702 100644 --- a/project.cbp +++ b/project.cbp @@ -32,11 +32,6 @@ - - diff --git a/project.depend b/project.depend new file mode 100644 index 0000000..928090b --- /dev/null +++ b/project.depend @@ -0,0 +1,4 @@ +# depslib dependency file v1.0 +1742493127 source:c:\users\4739297\onedrive\Πΰαξχθι ρςξλ\lab02\alice\project\main.cpp + + diff --git a/report.txt b/report.txt new file mode 100644 index 0000000..d479126 --- /dev/null +++ b/report.txt @@ -0,0 +1,1031 @@ +ΠžΡ‚Ρ‡Π΅Ρ‚ ΠΏΠΎ Π»Π°Π±ΠΎΡ€Π°Ρ‚ΠΎΡ€Π½ΠΎΠΉ Ρ€Π°Π±ΠΎΡ‚Π΅ β„– 2 "БистСма контроля вСрсий Git" + +Π’Ρ‹ΠΏΠΎΠ»Π½ΠΈΠ»: Π’ΠΈΠ½ΠΎΠ³Ρ€Π°Π΄ΠΎΠ² Максим Артёмович +Π“Ρ€ΡƒΠΏΠΏΠ°: А-02-24 +ΠŸΡ€ΠΎΠ²Π΅Ρ€ΠΈΠ»: + +ΠŸΡ€ΠΈΠΌΠ΅Ρ‡Π°Π½ΠΈΠ΅: Ρ€Π°Π±ΠΎΡ‚Π° Π²Ρ‹ΠΏΠΎΠ»Π½ΡΠ»Π°ΡΡŒ Π½Π° Windows. + +1. Π‘ΠΎΠ·Π΄Π°Π» Π½Π° Ρ€Π°Π±ΠΎΡ‡Π΅ΠΌ столС ΠΊΠ°Ρ‚Π°Π»ΠΎΠ³ lab02 ΠΈ запустил Π² Π½Π΅ΠΌ Git Bash, ΠΏΡ€ΠΈΠ³Π»Π°ΡˆΠ΅Π½ΠΈΠ΅: + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02 +$ + + +2. ΠŸΡ€ΠΎΡΠΌΠΎΡ‚Ρ€Π΅Π» Ρ„Π°ΠΉΠ»Ρ‹ Π² Ρ€Π°Π±ΠΎΡ‡Π΅ΠΌ ΠΊΠ°Ρ‚Π°Π»ΠΎΠ³Π΅ ΠΌΠΎΠΆΠ½ΠΎ ΠΊΠΎΠΌΠ°Π½Π΄ΠΎΠΉ "ls" --- пусто: + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02 +$ ls + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02 +$ + + +3. Π‘ΠΎΠ·Π΄Π°Π» ΠΊΠ°Ρ‚Π°Π»ΠΎΠ³ΠΈ Алисы ΠΈ Π‘ΠΎΠ±Π°, создал ΠΊΠ°Ρ‚Π°Π»ΠΎΠ³ "project", +ΠΈΠ·ΡƒΡ‡ΠΈΠ» ΠΊΠΎΠΌΠ°Π½Π΄Ρƒ "cd" Π² процСссС: + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02 +$ mkdir alice + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02 +$ mkdir bob + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02 +$ cd bob + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/bob +$ cd .. + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02 +$ cd alice + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice +$ mkdir project + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice +$ cd project + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project +$ cd .. + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice +$ cd project + + + +4. Π˜Π½ΠΈΡ†ΠΈΠ°Π»ΠΈΠ·ΠΈΡ€ΠΎΠ²Π°Π» Ρ€Π΅ΠΏΠΎΠ·ΠΈΡ‚Π°Ρ€ΠΈΠΉ: +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project +$ git init +Initialized empty Git repository in C:/Users/4739297/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project/.git/ + +Π£ мСня имя Π²Π΅Ρ‚ΠΊΠΈ ΠΏΠΎ ΡƒΠΌΠΎΠ»Ρ‡Π°Π½ΠΈΡŽ Π½Π΅ настроСно. +Git создал Π²Π΅Ρ‚ΠΊΡƒ ΠΏΠΎΠ΄ Π½Π°Π·Π²Π°Π½ΠΈΠ΅ΠΌ master, Ρ‡Ρ‚ΠΎ Π²ΠΈΠ΄Π½ΠΎ Π² ΠΏΡ€ΠΈΠ³Π»Π°ΡˆΠ΅Π½ΠΈΠΈ Ρ‚Π΅Ρ€ΠΌΠΈΠ½Π°Π»Π°. +Имя Π²Π΅Ρ‚ΠΊΠΈ Π½Π΅ мСнял, Ρ‚Π°ΠΊ ΠΊΠ°ΠΊ подсказка Π½Π΅ появлялась. + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (master) +$ git config user.name 'Alice (VinogradovMA)' + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (master) +$ git config user.email 'maximvinogr@gmail.com' + + +4739297@LAPTOP-MFEP4RO7 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) + main.cpp + project.cbp + +nothing added to commit but untracked files present (use "git add" to track) + +ПослС Π²Π²ΠΎΠ΄Π° ΠΊΠΎΠΌΠ°Π½Π΄Ρ‹, консоль Π²Ρ‹Π²ΠΎΠ΄ΠΈΡ‚ Ρ‡Ρ‚ΠΎ Π½Π΅Ρ‚ ΠΊΠΎΠΌΠΈΡ‚ΠΎΠ² ΠΏΡ€ΠΎΠ΅ΠΊΡ‚Π°, Ρ‡Ρ‚ΠΎ Ρ„Π°ΠΉΠ»Ρ‹ ΠΏΡ€ΠΎΠ΅ΠΊΡ‚Π° Π½Π΅ Π΄ΠΎΠ±Π°Π²Π»Π΅Π½Ρ‹ Π² git, ΠΈ ΠΈΡ… ΠΌΠΎΠΆΠ½ΠΎ Π΄ΠΎΠ±Π°Π²ΠΈΡ‚ΡŒ +ΠΊΠΎΠΌΠ°Π½Π΄ΠΎΠΉ git add Π² ΠΊΠΎΠΌΠΈΡ‚. Π’ ΠΊΠΎΠ½Ρ†Π΅ ΠΏΠΈΡˆΠ΅Ρ‚,Ρ‡Ρ‚ΠΎ Π½Π΅Ρ‚ Ρ„Π°ΠΉΠ»ΠΎΠ² для ΠΊΠΎΠΌΠΈΡ‚Π°, Π½ΠΎ Π΅ΡΡ‚ΡŒ Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎΡΡ‚ΡŒ ΠΈΡ… Π΄ΠΎΠ±Π°Π²ΠΈΡ‚ΡŒ. + + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (master) +$ git add main.cpp + +4739297@LAPTOP-MFEP4RO7 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) + project.cbp + + +ΠŸΠΈΡˆΠ΅Ρ‚, Ρ‡Ρ‚ΠΎ Π½Π΅Ρ‚ ΠΊΠΎΠΌΠΈΡ‚ΠΎΠ²,Π½ΠΎ Π΅ΡΡ‚ΡŒ Ρ„Π°ΠΉΠ»Ρ‹ , ΠΊΠΎΡ‚ΠΎΡ€Ρ‹Π΅ привязаны ΠΊ ΠΊΠΎΠΌΠΈΡ‚Ρƒ. Π’ ΠΊΠΎΠ½Ρ†Π΅ ΠΏΠΈΡˆΠ΅Ρ‚ Ρ„Π°ΠΉΠ»Ρ‹, ΠΊΠΎΡ‚ΠΎΡ€Ρ‹Π΅ Π½Π΅ привязаны ΠΊ ΠΊΠΎΠΌΠΈΡ‚Ρƒ. + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (master) +$ git commit -m 'code: Π·Π°Π³ΠΎΡ‚ΠΎΠ²ΠΊΠ° ΠΏΡ€ΠΎΠ³Ρ€Π°ΠΌΠΌΡ‹' +[master (root-commit) bdea437] code: Π·Π°Π³ΠΎΡ‚ΠΎΠ²ΠΊΠ° ΠΏΡ€ΠΎΠ³Ρ€Π°ΠΌΠΌΡ‹ + 1 file changed, 9 insertions(+) + create mode 100644 main.cpp + +ΠŸΠΈΡˆΠ΅Ρ‚,Ρ‡Ρ‚ΠΎ 1 Ρ„Π°ΠΉΠ» Π±Ρ‹Π» ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ с (послСднСго) ΠΊΠΎΠΌΠΈΡ‚Π°, ΠΏΡ€ΠΈ этом ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΎ 9 строчСк ΠΊΠΎΠ΄Π°, Π² нашСм случаС ΠΏΠΈΡˆΠ΅Ρ‚ ΠΏΡ€ΠΎ 9 строчСк ΠΊΠΎΠ΄Π° Π²Π½ΡƒΡ‚Ρ€ΠΈ main.cpp. + + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (master) +$ git add project.cbp +warning: LF will be replaced by CRLF in project.cbp. +The file will have its original line endings in your working directory + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (master) +$ git status +On branch master +Changes to be committed: + (use "git restore --staged ..." to unstage) + new file: project.cbp + +ДобавляСм Ρ„Π°ΠΉΠ» ΠΏΡ€ΠΎΠ΅ΠΊΡ‚Π° Π² git, послС этого провСряСм добавилось Π»ΠΈ ΠΎΠ½ΠΎ Π² git, Π² ΠΎΡ‚Π²Π΅Ρ‚ консоль Π²Ρ‹Π²ΠΎΠ΄ΠΈΡ‚ , Ρ‡Ρ‚ΠΎ этот Ρ„Π°ΠΉΠ» находится Π² измСнСниях ,ΠΈ ΠΌΠΎΠΆΠ½ΠΎ Π·Π°ΠΊΠΎΠΌΠΈΡ‚ΠΈΡ‚ΡŒ эти измСнСния.\ + + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (master) +$ git commit -m 'build: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Ρ„Π°ΠΉΠ» ΠΏΡ€ΠΎΠ΅ΠΊΡ‚Π°' +[master 53f0771] build: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Ρ„Π°ΠΉΠ» ΠΏΡ€ΠΎΠ΅ΠΊΡ‚Π° + 1 file changed, 40 insertions(+) + create mode 100644 project.cbp + +Π”Π΅Π»Π°Π΅ΠΌ ΠΊΠΎΠΌΠΌΠΈΡ‚ ΠΈ ΠΏΠΎΠ»ΡƒΡ‡Π°Π΅ΠΌ Π² консоли,Ρ‡Ρ‚ΠΎ 1 Ρ„Π°ΠΉΠ» ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ (Ρ‚ΠΎ-Π΅ΡΡ‚ΡŒ Ρ„Π°ΠΉΠ» ΠΏΡ€ΠΎΠ΅ΠΊΡ‚Π°). + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (master) +$ git status +On branch master +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 + +no changes added to commit (use "git add" and/or "git commit -a") + +ΠŸΡ€ΠΎΠ²Π΅Ρ€ΡΠ΅ΠΌ статус git, выводится, Ρ‡Ρ‚ΠΎ ΠΈΠΌΠ΅ΡŽΡ‚ΡΡ измСнСния Π² Ρ„Π°ΠΉΠ»Π΅ main.cpp (это ΠΊΠ°ΠΊ Ρ€Π°Π· Ρ‚Π΅ 3 строки, ΠΊΠΎΡ‚ΠΎΡ€Ρ‹Π΅ ΠΌΡ‹ Π΄ΠΎΠ±Π°Π²ΠΈΠ»ΠΈ Π² Ρ„ΡƒΠ½ΠΊΡ†ΠΈΡŽ main() ) + + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (master) +$ git add main.cpp + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (master) +$ git commit -m "code: Π²Π²ΠΎΠ΄ Π΄Π°Π½Π½Ρ‹Ρ…" +[master d37c0ae] code: Π²Π²ΠΎΠ΄ Π΄Π°Π½Π½Ρ‹Ρ… + 1 file changed, 3 insertions(+), 2 deletions(-) + +Π’Ρ‹Π±ΠΈΡ€Π°Π΅ΠΌ Ρ„Π°ΠΉΠ»Ρ‹, измСнСния ΠΊΠΎΡ‚ΠΎΡ€Ρ‹ΠΉ Π²ΠΎΠΉΠ΄ΡƒΡ‚ Π² ΠΊΠΎΠΌΠΌΠΈΡ‚, послС этого Π΄Π΅Π»Π°Π΅ΠΌ сам ΠΊΠΎΠΌΠΌΠΈΡ‚. Консоль Π²Ρ‹Π²ΠΎΠ΄ΠΈΡ‚,Ρ‡Ρ‚ΠΎ 3 строки Π΄ΠΎΠ±Π°Π²Π΅Π½ΠΎ, 2 строки ΡƒΠ΄Π°Π»Π΅Π½ΠΎ, 1 Ρ„Π°ΠΉΠ» ΠΈΠ·ΠΌΠ΅Π½Π΅Π½. + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (master) +$ git add -u + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (master) +$ git commit -m "code: Π²Ρ‹Π²ΠΎΠ΄ суммы" +[master 8469014] code: Π²Ρ‹Π²ΠΎΠ΄ суммы + 1 file changed, 1 insertion(+) + +Π”ΠΎΠ±Π°Π²ΠΈΠ» Π²Ρ‹Π²ΠΎΠ΄ суммы Π² ΠΏΡ€ΠΎΠ³Ρ€Π°ΠΌΠΌΡƒ,послС этого Π΄ΠΎΠ±Π°Π²ΠΈΠ» Π² индСкс всС измСнСния ΠΈ сдСлал ΠΊΠΎΠΌΠΌΠΈΡ‚. ПослС ΠΊΠΎΠΌΠΌΠΈΡ‚Π° Π²Ρ‹Π²Π΅Π»ΠΎΡΡŒ, Ρ‡Ρ‚ΠΎ добавилась ΠΎΠ΄Π½Π° строка Π² Ρ„Π°ΠΉΠ»Π΅ ΠΈ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ 1 Ρ„Π°ΠΉΠ». + + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (master) +$ git commit -a -m "code: Π²Ρ‹Π²ΠΎΠ΄ разности" +[master 1662b88] code: Π²Ρ‹Π²ΠΎΠ΄ разности + 1 file changed, 2 insertions(+), 1 deletion(-) + +Π˜ΡΠΏΡ€Π°Π²ΠΈΠ» Π²Ρ‹Π²ΠΎΠ΄ суммы ΠΈ Π΄ΠΎΠ±Π°Π²ΠΈΠ» Π²Ρ‹Π²ΠΎΠ΄ разности.ПослС этого Π΄ΠΎΠ±Π°Π²ΠΈΠ» всС измСнСния ΠΈ сдСлал ΠΊΠΎΠΌΠΌΠΈΡ‚ Π² ΠΎΠ΄ΠΈΠ½ шаг. Консоль Π²Ρ‹Π²ΠΎΠ΄ΠΈΡ‚,Ρ‡Ρ‚ΠΎ ΠΎΠ΄Π½Π° строка Π±Ρ‹Π»Π° ΡƒΠ±Ρ€Π°Π½Π°, Π° 2 Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ΠΎ, ΠΏΡ€ΠΈ этом измСнился 1 Ρ„Π°ΠΉΠ». + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (master) +$ git branch -m main + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main) + +ПомСняСм имя Π²Π΅Ρ‚ΠΊΠΈ Π½Π° main. + +4739297@LAPTOP-MFEP4RO7 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) + +Π—Π°Π±ΠΈΠ»Π΄ΠΈΠ»ΠΈ ΠΏΡ€ΠΎΠ΅ΠΊΡ‚.Π”ΠΎΠ±Π°Π²ΠΈΠ»ΠΈ Ρ„Π°ΠΉΠ», ΠΊΠΎΡ‚ΠΎΡ€Ρ‹ΠΉ Π±ΡƒΠ΄Π΅Ρ‚ ΠΈΠ³Π½ΠΎΡ€ΠΈΡ€ΠΎΠ²Π°Ρ‚ΡŒ git, Ρ„Π°ΠΉΠ» /bin ΡƒΡΠΏΠ΅ΡˆΠ½ΠΎ игнорируСтся. + +4739297@LAPTOP-MFEP4RO7 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) + +Π”ΠΎΠ±Π°Π²ΠΈΠ»ΠΈ Π² ΠΈΠ³ΠΎΡ€ΠΈΡ€ΠΎΠ²Π°Π½ΠΈΠ΅ Ρ„Π°ΠΉΠ» obj, ΠΈΠ³Π½ΠΎΡ€ΠΈΡ€ΠΎΠ²Π°Π½ΠΈΠ΅ ΡƒΡΠΏΠ΅ΡˆΠ½ΠΎ. + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main) +$ git add .gitignore + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main) +$ git commit -m "git" +[main 63ba1ff] git + 1 file changed, 2 insertions(+) + create mode 100644 .gitignore + +Π”ΠΎΠ±Π°Π²ΠΈΠ»ΠΈ Π² ΠΊΠΎΠΌΠΌΠΈΡ‚ .gitignore, послС этого сдСлали ΠΊΠΎΠΌΠΌΠΈΡ‚ с Ρ‚Π΅ΠΌΠΎΠΉ "git". + + + + + + + + + + + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main) +$ git log +commit 63ba1ff1d3d2988be130b102614dfb34c64ced17 (HEAD -> main) +Author: Alice (VinogradovMA) +Date: Thu Mar 20 21:11:06 2025 +0300 + + git + +commit 1662b88ea45a547e55d36cd99ed1a2810009c681 +Author: Alice (VinogradovMA) +Date: Thu Mar 20 20:52:59 2025 +0300 + + code: Π²Ρ‹Π²ΠΎΠ΄ разности + +commit 846901458a6e0c232bc006e3b323f98eb92cc663 +Author: Alice (VinogradovMA) +Date: Thu Mar 20 20:48:13 2025 +0300 + + code: Π²Ρ‹Π²ΠΎΠ΄ суммы + +commit d37c0aeecc5e4796aeff0e050d558815b417a6aa +Author: Alice (VinogradovMA) +Date: Thu Mar 20 20:40:05 2025 +0300 + + code: Π²Π²ΠΎΠ΄ Π΄Π°Π½Π½Ρ‹Ρ… + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main) +$ git log --oneline --decorate +63ba1ff (HEAD -> main) git +* 1662b88 code: Π²Ρ‹Π²ΠΎΠ΄ разности +* 8469014 code: Π²Ρ‹Π²ΠΎΠ΄ суммы +* d37c0ae code: Π²Π²ΠΎΠ΄ Π΄Π°Π½Π½Ρ‹Ρ… +53f0771 build: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Ρ„Π°ΠΉΠ» ΠΏΡ€ΠΎΠ΅ΠΊΡ‚Π° +bdea437 code: Π·Π°Π³ΠΎΡ‚ΠΎΠ²ΠΊΠ° ΠΏΡ€ΠΎΠ³Ρ€Π°ΠΌΠΌΡ‹ + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main) +$ git log --oneline --decorate --all --graph +* 63ba1ff (HEAD -> main) git +* 1662b88 code: Π²Ρ‹Π²ΠΎΠ΄ разности +* 8469014 code: Π²Ρ‹Π²ΠΎΠ΄ суммы +* d37c0ae code: Π²Π²ΠΎΠ΄ Π΄Π°Π½Π½Ρ‹Ρ… +* 53f0771 build: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Ρ„Π°ΠΉΠ» ΠΏΡ€ΠΎΠ΅ΠΊΡ‚Π° +* bdea437 code: Π·Π°Π³ΠΎΡ‚ΠΎΠ²ΠΊΠ° ΠΏΡ€ΠΎΠ³Ρ€Π°ΠΌΠΌΡ‹ + + + + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main) +$ git log --stat +commit 63ba1ff1d3d2988be130b102614dfb34c64ced17 (HEAD -> main) +Author: Alice (VinogradovMA) +Date: Thu Mar 20 21:11:06 2025 +0300 + + git + + .gitignore | 2 ++ + 1 file changed, 2 insertions(+) + +commit 1662b88ea45a547e55d36cd99ed1a2810009c681 +Author: Alice (VinogradovMA) +Date: Thu Mar 20 20:52:59 2025 +0300 + + code: Π²Ρ‹Π²ΠΎΠ΄ разности + + main.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 846901458a6e0c232bc006e3b323f98eb92cc663 +Author: Alice (VinogradovMA) +Date: Thu Mar 20 20:48:13 2025 +0300 + + code: Π²Ρ‹Π²ΠΎΠ΄ суммы + + +Π’ послСднСм ΠΊΠΎΠΌΠΌΠΈΡ‚Π΅ выводится Π°Π²Ρ‚ΠΎΡ€ ΠΊΠΎΠΌΠΌΠΈΡ‚Π°, Π΄Π°Ρ‚Ρƒ ΠΈ врСмя,послС этого ΠΏΠΈΡˆΠ΅Ρ‚ΡΡ ,Ρ‡Ρ‚ΠΎ Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Ρ„Π°ΠΉΠ» .gitignore, Π³Π΄Π΅ добавилось 2 строки. + + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main) +$ git log --grep "build:" +commit 53f077173d34d5c866629aa359e99fc1d5eaac88 +Author: Alice (VinogradovMA) +Date: Thu Mar 20 20:32:42 2025 +0300 + + build: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Ρ„Π°ΠΉΠ» ΠΏΡ€ΠΎΠ΅ΠΊΡ‚Π° + + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main) +$ git log -- project.cbp +commit 53f077173d34d5c866629aa359e99fc1d5eaac88 +Author: Alice (VinogradovMA) +Date: Thu Mar 20 20:32:42 2025 +0300 + + build: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Ρ„Π°ΠΉΠ» ΠΏΡ€ΠΎΠ΅ΠΊΡ‚Π° + + + + + + + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main) +$ git show HEAD +commit 63ba1ff1d3d2988be130b102614dfb34c64ced17 (HEAD -> main) +Author: Alice (VinogradovMA) +Date: Thu Mar 20 21:11:06 2025 +0300 + + git + +diff --git a/.gitignore b/.gitignore +new file mode 100644 +index 0000000..4c7473d +--- /dev/null ++++ b/.gitignore +@@ -0,0 +1,2 @@ ++/bin ++/obj + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main) +$ git show main +commit 63ba1ff1d3d2988be130b102614dfb34c64ced17 (HEAD -> main) +Author: Alice (VinogradovMA) +Date: Thu Mar 20 21:11:06 2025 +0300 + + git + +diff --git a/.gitignore b/.gitignore +new file mode 100644 +index 0000000..4c7473d +--- /dev/null ++++ b/.gitignore +@@ -0,0 +1,2 @@ ++/bin ++/obj + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main) +$ git show 63ba1ff1d3d2988be130b102614dfb34c64ced17 +commit 63ba1ff1d3d2988be130b102614dfb34c64ced17 (HEAD -> main) +Author: Alice (VinogradovMA) +Date: Thu Mar 20 21:11:06 2025 +0300 + + git + +diff --git a/.gitignore b/.gitignore +new file mode 100644 +index 0000000..4c7473d +--- /dev/null ++++ b/.gitignore +@@ -0,0 +1,2 @@ ++/bin ++/obj + + + + + + + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main) +$ git show HEAD~1 +commit 1662b88ea45a547e55d36cd99ed1a2810009c681 +Author: Alice (VinogradovMA) +Date: Thu Mar 20 20:52:59 2025 +0300 + + code: Π²Ρ‹Π²ΠΎΠ΄ разности + +diff --git a/main.cpp b/main.cpp +index 2fbd623..fd75bba 100644 +--- a/main.cpp ++++ b/main.cpp +@@ -7,5 +7,6 @@ int main() + cout << "Enter A and B: "; + int a, b; + cin >> a >> b; +- cout << a+b; ++ cout << "A + B = " << a + b << '\n' ++ << "A - B = " << a - b << '\n'; + } + + +Π‘ΠΌΠΎΡ‚Ρ€ΠΈΠΌ прСдпослСдний ΠΊΠΎΠΌΠΌΠΈΡ‚ , Π³Π΄Π΅ измСнялся ΠΊΠΎΠ΄ ΠΏΡ€ΠΎΠ³Ρ€Π°ΠΌΠΌΡ‹. + + + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main) +$ git diff + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main) +$ git diff +diff --git a/main.cpp b/main.cpp +index fd75bba..91f8982 100644 +--- a/main.cpp ++++ b/main.cpp +@@ -8,5 +8,6 @@ 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'; + } + +Π”ΠΎΠ±Π°Π²ΠΈΠ»ΠΈ строку Π²Ρ‹Π²ΠΎΠ΄Π° произвСдСния, послС этого просмотрСли измСнСния. + + + +4739297@LAPTOP-MFEP4RO7 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 2fbd623..91f8982 100644 +--- a/main.cpp ++++ b/main.cpp +@@ -7,5 +7,7 @@ int main() + cout << "Enter A and B: "; + int a, b; + cin >> a >> b; +- cout << a+b; ++ cout << "A + B = " << a + b << '\n' ++ << "A - B = " << a - b << '\n' ++ << "A * B = " << a * b << '\n'; + } + + + +4739297@LAPTOP-MFEP4RO7 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 2fbd623..fd75bba 100644 +--- a/main.cpp ++++ b/main.cpp +@@ -7,5 +7,6 @@ int main() + cout << "Enter A and B: "; + int a, b; + cin >> a >> b; +- cout << a+b; ++ cout << "A + B = " << a + b << '\n' ++ << "A - B = " << a - b << '\n'; + } + + + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main) +$ git commit -a -m "code: Π²Ρ‹Π²ΠΎΠ΄ произвСдСния" +[main 0364b6e] code: Π²Ρ‹Π²ΠΎΠ΄ произвСдСния + 1 file changed, 2 insertions(+), 1 deletion(-) + + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main) +$ git diff head~5 head~1 +diff --git a/main.cpp b/main.cpp +index b4392ec..fd75bba 100644 +--- a/main.cpp ++++ b/main.cpp +@@ -4,6 +4,9 @@ using namespace std; + + int main() + { +- cout << "Hello world!" << endl; +- return 0; ++ cout << "Enter A and B: "; ++ int a, b; ++ cin >> a >> b; ++ cout << "A + B = " << a + b << '\n' ++ << "A - B = " << a - b << '\n'; + } +diff --git a/project.cbp b/project.cbp +new file mode 100644 +index 0000000..99bb702 +--- /dev/null ++++ b/project.cbp +@@ -0,0 +1,40 @@ ++ + + + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main) +$ git reset --hard HEAD~1 +HEAD is now at 63ba1ff git + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main) +$ git checkout HEAD -- main.cpp + + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main) +$ ssh-keygen +Generating public/private rsa key pair. +Enter file in which to save the key (/c/Users/4739297/.ssh/id_rsa): +Enter passphrase (empty for no passphrase): +Enter same passphrase again: +Your identification has been saved in /c/Users/4739297/.ssh/id_rsa +Your public key has been saved in /c/Users/4739297/.ssh/id_rsa.pub +The key fingerprint is: +SHA256:KgnXVgY9vFWfWD63lECXhI4/w9HHlJlb0XAAYTnjgqI 4739297@LAPTOP-MFEP4RO7 +The key's randomart image is: ++---[RSA 3072]----+ +| .o .****O| +| .+ ..+*oB=| +| o= .+o*=+| +| ..oo ...o.=+| +| . ..o.S .o ...| +| oEo . = | +| o . o | +| . | +| | ++----[SHA256]-----+ + + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main) +$ eval $(ssh-agent -s) +Agent pid 1258 + + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main) +$ ssh-add +Enter passphrase for /c/Users/4739297/.ssh/id_rsa: +Identity added: /c/Users/4739297/.ssh/id_rsa (4739297@LAPTOP-MFEP4RO7) + + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main) +$ cat ~/.ssh/id_rsa.pub +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDlwe9oD9NCJxkGtzJWiwj4vFOnXbBnL1+N+d9QYGLcyJVWg7KFfNqaapUOdVCdVssfONS0QFpJvjrPvuzFfE0kp6iQlI+Q2Zikg1+9Qde0rY15oht1POWHfT8gULwJBwgOByD2gXbH0UYG3FYVBgU9Y8S1YMsbv5Xl3V34/UVVQZDziUztBAQ2CXsPTWsdESGAyRKFAbZ0SpS+zB7nmiAGZsiZXUkxXl6kJz5EuACRDdKESC0SUQSJ5Xos6hAnWX5W6NFe0VvTXQ1DqAa0NXJkVtPdM7bz/VQTrE5FgNVWCyNG+i6X5WS6oPPlWYv6zhoG6j8uph5nnVymBhMzypaui1ywXvNWomwgVPygl0Hc2U2KBVWdeJmaZ8QJCo3McXpk41tl8moBg1oCtXsaF5zBL7kZpbSM+FQfj/JrswWm/cFufwhRvV8FQXfrC7pPj2I4z7RPQMC3VQUzqa3mzyhvbgI5LyiZkli3FTI20n+m33rgg2FLLZOOLlkRpAH5e+M= 4739297@LAPTOP-MFEP4RO7 + + + + + + + + + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main) +$ touch README.md +git add README.md +git commit -m "first commit" +git remote add origin git@uit.mpei.ru:VinogradovMA/cs-lab02.git +git push -u origin main +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main) +$ git init +Reinitialized existing Git repository in C:/Users/4739297/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project/.git/ + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main) +$ git checkout -b main +fatal: A branch named 'main' already exists. + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main) +$ git add README.md + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main) +$ git commit -m "first commit" +[main 08d4449] first commit + 1 file changed, 0 insertions(+), 0 deletions(-) + create mode 100644 README.md + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main) +$ git remote add origin git@uit.mpei.ru:VinogradovMA/cs-lab02.git + +4739297@LAPTOP-MFEP4RO7 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.40 KiB | 819.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:VinogradovMA/cs-lab02.git + * [new branch] main -> main +Branch 'main' set up to track remote branch 'main' from 'origin'. + + + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/bob +$ git clone git@uit.mpei.ru:VinogradovMA/cs-lab02.git project +Cloning into 'project'... +Enter passphrase for key '/c/Users/4739297/.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. + +Π‘ΠΊΠΎΠΏΠΈΡ€ΠΎΠ²Π°Π»ΠΈ ΠΏΡ€ΠΎΠ΅ΠΊΡ‚ для Π±ΠΎΠ±Π°. + + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/bob +$ cd project + + + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/bob/project (main) +$ git init +Reinitialized existing Git repository in C:/Users/4739297/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/bob/project/.git/ + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/bob/project (main) +$ git config user.name 'Bob (VinogardovMA)' + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/bob/project (main) +$ git config user.email 'maximvinogr@gmail.com' + + + + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/bob/project (main) +$ git commit -a -m "code: ΠΏΡ€Π°Π²ΠΊΠ° отступов" +[main 00b78bf] code: ΠΏΡ€Π°Π²ΠΊΠ° отступов + 1 file changed, 2 insertions(+), 2 deletions(-) + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/bob/project (main) +$ git show +commit 00b78bf7dc233c52d45844233e203ad1a55138f5 (HEAD -> main) +Author: Bob (VinogardovMA) +Date: Fri Mar 21 13:42:16 2025 +0300 + + code: ΠΏΡ€Π°Π²ΠΊΠ° отступов + +diff --git a/main.cpp b/main.cpp +index 91f8982..f372c78 100644 +--- a/main.cpp ++++ b/main.cpp +@@ -8,6 +8,6 @@ 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' ++ << "A * B = " << a * b << '\n'; + } + + + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/bob/project (main) +$ git push +Enter passphrase for key '/c/Users/4739297/.ssh/id_rsa': +Enumerating objects: 8, done. +Counting objects: 100% (8/8), done. +Delta compression using up to 8 threads +Compressing objects: 100% (6/6), done. +Writing objects: 100% (6/6), 570 bytes | 570.00 KiB/s, done. +Total 6 (delta 4), reused 0 (delta 0), pack-reused 0 +remote: . Processing 1 references +remote: Processed 1 references in total +To uit.mpei.ru:VinogradovMA/cs-lab02.git + 08d4449..00b78bf main -> main + + + + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main) +$ git fetch +Enter passphrase for key '/c/Users/4739297/.ssh/id_rsa': +remote: Enumerating objects: 8, done. +remote: Counting objects: 100% (8/8), done. +remote: Compressing objects: 100% (6/6), done. +remote: Total 6 (delta 4), reused 0 (delta 0), pack-reused 0 +Unpacking objects: 100% (6/6), 550 bytes | 21.00 KiB/s, done. +From uit.mpei.ru:VinogradovMA/cs-lab02 + 08d4449..00b78bf main -> origin/main + + + + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main) +$ git log --oneline --decorate --all --graph +* 00b78bf (origin/main) code: ΠΏΡ€Π°Π²ΠΊΠ° отступов +* 59202e8 code: Π²Ρ‹Π²ΠΎΠ΄ произвСдСния +* 08d4449 (HEAD -> main) first commit +* 63ba1ff git +* 1662b88 code: Π²Ρ‹Π²ΠΎΠ΄ разности +* 8469014 code: Π²Ρ‹Π²ΠΎΠ΄ суммы +* d37c0ae code: Π²Π²ΠΎΠ΄ Π΄Π°Π½Π½Ρ‹Ρ… +* 53f0771 build: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Ρ„Π°ΠΉΠ» ΠΏΡ€ΠΎΠ΅ΠΊΡ‚Π° +* bdea437 code: Π·Π°Π³ΠΎΡ‚ΠΎΠ²ΠΊΠ° ΠΏΡ€ΠΎΠ³Ρ€Π°ΠΌΠΌΡ‹ + + + + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main) +$ git pull --ff-only +Enter passphrase for key '/c/Users/4739297/.ssh/id_rsa': +Updating 08d4449..00b78bf +Fast-forward + main.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + + + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main) +$ git commit -a -m "code: Π²Ρ‹Π²ΠΎΠ΄ частного" +warning: LF will be replaced by CRLF in project.cbp. +The file will have its original line endings in your working directory +[main 0655b6f] code: Π²Ρ‹Π²ΠΎΠ΄ частного + 3 files changed, 8 insertions(+), 1 deletion(-) + + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main) +$ git push +Enter passphrase for key '/c/Users/4739297/.ssh/id_rsa': +Enumerating objects: 9, done. +Counting objects: 100% (9/9), done. +Delta compression using up to 8 threads +Compressing objects: 100% (4/4), done. +Writing objects: 100% (5/5), 567 bytes | 283.00 KiB/s, done. +Total 5 (delta 2), reused 0 (delta 0), pack-reused 0 +remote: . Processing 1 references +remote: Processed 1 references in total +To uit.mpei.ru:VinogradovMA/cs-lab02.git + 00b78bf..0655b6f main -> main + + + + + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/bob/project (main) +$ git fetch +Enter passphrase for key '/c/Users/4739297/.ssh/id_rsa': +remote: Enumerating objects: 9, done. +remote: Counting objects: 100% (9/9), done. +remote: Compressing objects: 100% (4/4), done. +remote: Total 5 (delta 2), reused 0 (delta 0), pack-reused 0 +Unpacking objects: 100% (5/5), 547 bytes | 32.00 KiB/s, done. +From uit.mpei.ru:VinogradovMA/cs-lab02 + 00b78bf..0655b6f main -> origin/main + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/bob/project (main) +$ git log --oneline --decorate --all --graph +* 0655b6f (origin/main, origin/HEAD) code: Π²Ρ‹Π²ΠΎΠ΄ частного +* 00b78bf (HEAD -> main) code: ΠΏΡ€Π°Π²ΠΊΠ° отступов +* 59202e8 code: Π²Ρ‹Π²ΠΎΠ΄ произвСдСния +* 08d4449 first commit +* 63ba1ff git +* 1662b88 code: Π²Ρ‹Π²ΠΎΠ΄ разности +* 8469014 code: Π²Ρ‹Π²ΠΎΠ΄ суммы +* d37c0ae code: Π²Π²ΠΎΠ΄ Π΄Π°Π½Π½Ρ‹Ρ… +* 53f0771 build: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Ρ„Π°ΠΉΠ» ΠΏΡ€ΠΎΠ΅ΠΊΡ‚Π° +* bdea437 code: Π·Π°Π³ΠΎΡ‚ΠΎΠ²ΠΊΠ° ΠΏΡ€ΠΎΠ³Ρ€Π°ΠΌΠΌΡ‹ + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/bob/project (main) +$ git pull --ff-only +Enter passphrase for key '/c/Users/4739297/.ssh/id_rsa': +Updating 00b78bf..0655b6f +Fast-forward + .gitignore | 1 + + main.cpp | 3 ++- + project.cbp | 5 +++++ + 3 files changed, 8 insertions(+), 1 deletion(-) + + +Π΄ΠΎΠΏΠΎΠ»Π½ΠΈΡ‚Π΅ ΠΏΡ€ΠΎΠ³Ρ€Π°ΠΌΠΌΡƒ ΠΏΠ΅Ρ‡Π°Ρ‚ΡŒΡŽ максимума, сдСлайтС ΠΊΠΎΠΌΠΌΠΈΡ‚ ΠΈ ΠΎΡ‚ΠΏΡ€Π°Π²ΡŒΡ‚Π΅ Π΅Π³ΠΎ Π½Π° сСрвСр: + + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main) +$ git commit -a -m "code: Π²Ρ‹Π²ΠΎΠ΄ max" +[main 5f7fed3] code: Π²Ρ‹Π²ΠΎΠ΄ max + 1 file changed, 3 insertions(+), 2 deletions(-) + + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main) +$ git push +Enter passphrase for key '/c/Users/4739297/.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), 358 bytes | 358.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:VinogradovMA/cs-lab02.git + 0655b6f..5f7fed3 main -> main + + + + + +«На машинС Π‘ΠΎΠ±Π°Β» Π΄ΠΎΠΏΠΎΠ»Π½ΠΈΡ‚Π΅ ΠΏΡ€ΠΎΠ³Ρ€Π°ΠΌΠΌΡƒ ΠΏΠ΅Ρ‡Π°Ρ‚ΡŒΡŽ ΠΌΠΈΠ½ΠΈΠΌΡƒΠΌΠ°, сдСлайтС ΠΊΠΎΠΌΠΌΠΈΡ‚ ΠΈ ΠΏΠΎΠΏΡ‹Ρ‚Π°ΠΉΡ‚Π΅ΡΡŒ ΠΎΡ‚ΠΏΡ€Π°Π²ΠΈΡ‚ΡŒ Π΅Π³ΠΎ Π½Π° сСрвСр. Как ΠΌΠΎΠΆΠ½ΠΎ Π²ΠΈΠ΄Π΅Ρ‚ΡŒ, ΡƒΠ΄Π°Π»Π΅Π½Π½Ρ‹ΠΉ Ρ€Π΅ΠΏΠΎΠ·ΠΈΡ‚Π°Ρ€ΠΈΠΉ Π½Π΅ ΠΏΡ€ΠΈΠ½ΠΈΠΌΠ°Π΅Ρ‚ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ: ΠΊΠΎΠΌΠΌΠΈΡ‚ Π‘ΠΎΠ±Π° основан Π½Π΅ Π½Π° послСднСм ΡΡƒΡ‰Π΅ΡΡ‚Π²ΡƒΡŽΡ‰Π΅ΠΌ ΠΊΠΎΠΌΠΌΠΈΡ‚Π΅. + + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/bob/project (main) +$ git commit -a -m "code: Π²Ρ‹Π²ΠΎΠ΄ min" +[main bc6dcde] code: Π²Ρ‹Π²ΠΎΠ΄ min + 1 file changed, 3 insertions(+), 2 deletions(-) + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/bob/project (main) +$ git push +Enter passphrase for key '/c/Users/4739297/.ssh/id_rsa': +To uit.mpei.ru:VinogradovMA/cs-lab02.git + ! [rejected] main -> main (fetch first) +error: failed to push some refs to 'uit.mpei.ru:VinogradovMA/cs-lab02.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. + + + +Β«ΠžΡ‚ Π»ΠΈΡ†Π° Π‘ΠΎΠ±Π°Β» Π·Π°Π³Ρ€ΡƒΠ·ΠΈΡ‚Π΅ ΠΊΠΎΠΌΠΌΠΈΡ‚Ρ‹ ΠΈΠ· ΡƒΠ΄Π°Π»Π΅Π½Π½ΠΎΠ³ΠΎ Ρ…Ρ€Π°Π½ΠΈΠ»ΠΈΡ‰Π° ΠΈ ΠΎΡ‚ΠΎΠ±Ρ€Π°Π·ΠΈΡ‚Π΅ ΠΈΡΡ‚ΠΎΡ€ΠΈΡŽ всСх Π²Π΅Ρ‚ΠΎΠΊ β€” Ρ€Π΅Π·ΡƒΠ»ΡŒΡ‚Π°Ρ‚ Π½ΡƒΠΆΠ½ΠΎ ΠΏΡ€Π΅Π΄ΡΡ‚Π°Π²ΠΈΡ‚ΡŒ Π² ΠΎΡ‚Ρ‡Π΅Ρ‚Π΅. + + + + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/bob/project (main) +$ git fetch +Enter passphrase for key '/c/Users/4739297/.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), 338 bytes | 48.00 KiB/s, done. +From uit.mpei.ru:VinogradovMA/cs-lab02 + 0655b6f..5f7fed3 main -> origin/main + + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/bob/project (main) +$ git log --oneline --decorate --all --graph +* bc6dcde (HEAD -> main) code: Π²Ρ‹Π²ΠΎΠ΄ min +| * 5f7fed3 (origin/main, origin/HEAD) code: Π²Ρ‹Π²ΠΎΠ΄ max +|/ +* 0655b6f code: Π²Ρ‹Π²ΠΎΠ΄ частного +* 00b78bf code: ΠΏΡ€Π°Π²ΠΊΠ° отступов +* 59202e8 code: Π²Ρ‹Π²ΠΎΠ΄ произвСдСния +* 08d4449 first commit +* 63ba1ff git +* 1662b88 code: Π²Ρ‹Π²ΠΎΠ΄ разности +* 8469014 code: Π²Ρ‹Π²ΠΎΠ΄ суммы +* d37c0ae code: Π²Π²ΠΎΠ΄ Π΄Π°Π½Π½Ρ‹Ρ… +* 53f0771 build: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Ρ„Π°ΠΉΠ» ΠΏΡ€ΠΎΠ΅ΠΊΡ‚Π° +* bdea437 code: Π·Π°Π³ΠΎΡ‚ΠΎΠ²ΠΊΠ° ΠΏΡ€ΠΎΠ³Ρ€Π°ΠΌΠΌΡ‹ + + + + + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/bob/project (main) +$ git rebase origin/main +error: could not apply bc6dcde... code: Π²Ρ‹Π²ΠΎΠ΄ min +Resolve all conflicts manually, mark them as resolved with +"git add/rm ", then run "git rebase --continue". +You can instead skip this commit: run "git rebase --skip". +To abort and get back to the state before "git rebase", run "git rebase --abort". +Could not apply bc6dcde... code: Π²Ρ‹Π²ΠΎΠ΄ min +Auto-merging main.cpp +CONFLICT (content): Merge conflict in main.cpp + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/bob/project (main|REBASE 1/1) + +Π’Ρ‹Π΄Π°Π΅Ρ‚ ΠΎΡˆΠΈΠ±ΠΊΡƒ,Ρ‡Ρ‚ΠΎ Π½ΡƒΠΆΠ½ΠΎ ΡΠ΄Π΅Π»Π°Ρ‚ΡŒ слияниС,Π΄Π°Π±Ρ‹ ΡƒΠ±Ρ€Π°Ρ‚ΡŒ ΠΊΠΎΠ½Ρ„Π»ΠΈΠΊΡ‚ Π² Π³Π»Π°Π²Π½ΠΎΠΌ классС. + + + + + + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/bob/project (main|REBASE 1/1) +$ git add main.cpp + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/bob/project (main|REBASE 1/1) +$ git rebase --continue +[detached HEAD 0597d37] code: Π²Ρ‹Π²ΠΎΠ΄ min + 1 file changed, 2 insertions(+), 1 deletion(-) +Successfully rebased and updated refs/heads/main. + + + + + + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/bob/project (main) +$ git log --oneline --decorate --all --graph +* 0597d37 (HEAD -> main) code: Π²Ρ‹Π²ΠΎΠ΄ min +* 5f7fed3 (origin/main, origin/HEAD) code: Π²Ρ‹Π²ΠΎΠ΄ max +* 0655b6f code: Π²Ρ‹Π²ΠΎΠ΄ частного +* 00b78bf code: ΠΏΡ€Π°Π²ΠΊΠ° отступов +* 59202e8 code: Π²Ρ‹Π²ΠΎΠ΄ произвСдСния +* 08d4449 first commit +* 63ba1ff git +* 1662b88 code: Π²Ρ‹Π²ΠΎΠ΄ разности +* 8469014 code: Π²Ρ‹Π²ΠΎΠ΄ суммы +* d37c0ae code: Π²Π²ΠΎΠ΄ Π΄Π°Π½Π½Ρ‹Ρ… +* 53f0771 build: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Ρ„Π°ΠΉΠ» ΠΏΡ€ΠΎΠ΅ΠΊΡ‚Π° +* bdea437 code: Π·Π°Π³ΠΎΡ‚ΠΎΠ²ΠΊΠ° ΠΏΡ€ΠΎΠ³Ρ€Π°ΠΌΠΌΡ‹ + + + + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/bob/project (main) +$ git push +Enter passphrase for key '/c/Users/4739297/.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), 334 bytes | 334.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:VinogradovMA/cs-lab02.git + 5f7fed3..0597d37 main -> main + + + + + + + + + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main) +$ git branch double + + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main) +$ git checkout double +Switched to branch 'double' + + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (double) +$ git commit -a -m "code:double" +[double ff96c83] code:double + 1 file changed, 1 insertion(+), 1 deletion(-) + + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (double) +$ git checkout main +Switched to branch 'main' +Your branch is up to date with 'origin/main'. + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main) +$ git merge double +Updating 5f7fed3..ff96c83 +Fast-forward + main.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main) +$ git push +Enter passphrase for key '/c/Users/4739297/.ssh/id_rsa': +Enumerating objects: 10, done. +Counting objects: 100% (10/10), done. +Delta compression using up to 8 threads +Compressing objects: 100% (6/6), done. +Writing objects: 100% (6/6), 608 bytes | 608.00 KiB/s, done. +Total 6 (delta 4), reused 0 (delta 0), pack-reused 0 +remote: . Processing 1 references +remote: Processed 1 references in total +To uit.mpei.ru:VinogradovMA/cs-lab02.git + 0597d37..8201e88 main -> main + + + + + +4739297@LAPTOP-MFEP4RO7 MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main) +$ git log --oneline --decorate --all --graph +* 8201e88 (HEAD -> main, origin/main) Merge branch 'main' of uit.mpei.ru:VinogradovMA/cs-lab02 +|\ +| * 0597d37 code: Π²Ρ‹Π²ΠΎΠ΄ min +* | ff96c83 (double) code:double +|/ +* 5f7fed3 code: Π²Ρ‹Π²ΠΎΠ΄ max +* 0655b6f code: Π²Ρ‹Π²ΠΎΠ΄ частного +* 00b78bf code: ΠΏΡ€Π°Π²ΠΊΠ° отступов +* 59202e8 code: Π²Ρ‹Π²ΠΎΠ΄ произвСдСния +* 08d4449 first commit +* 63ba1ff git +* 1662b88 code: Π²Ρ‹Π²ΠΎΠ΄ разности +* 8469014 code: Π²Ρ‹Π²ΠΎΠ΄ суммы +* d37c0ae code: Π²Π²ΠΎΠ΄ Π΄Π°Π½Π½Ρ‹Ρ… +* 53f0771 build: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Ρ„Π°ΠΉΠ» ΠΏΡ€ΠΎΠ΅ΠΊΡ‚Π° +* bdea437 code: Π·Π°Π³ΠΎΡ‚ΠΎΠ²ΠΊΠ° ΠΏΡ€ΠΎΠ³Ρ€Π°ΠΌΠΌΡ‹ + + +