Выполнила: Криви А.С. Группа: А-02-23 Проверил:

Примечание: работа выполнялась на Windows.

Создала на рабочем столе каталог lab02 и запустила в нем Git Bash: Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02 $

Просмотрела файлы в рабочем каталоге с помощью командоы ls: Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02 $ ls Результат команты ls(пусто): Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02 $ Создала каталоги Алисы и Боба, с помощью команды mkdir: Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02 $ mkdir alice

Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02 $ mkdir bob

Создала каталог project в каталоге alice: Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02 $ cd alice

Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02 $ mkdir project

Проверила содержимое alice: Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02 $ ls project

Переход к каталогу project: Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02 $ cd project

Создание локального репозитория, инициализация репозитария, появление главной ветки master: Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02/alice/project $ git init Initialized empty Git repository in C:/Users/Сергей/Desktop/lab02/alice/project/.git/

настройка репозитария Алисы, для кого, чтобы последующие коммиты были от ее имени: Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02/alice/project (master) $ git config user.name 'Alice (KriviAS)'

Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02/alice/project (master) $ git config user.email 'KriviAS@mpei.ru'

Cоздание проекта в программе CodeBlocks, после сборки его, появление новых каталогов: Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02/alice/project (master) $ ls bin/ main.cpp obj/ project.cbp

Проверка статуса рабочей копии: Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/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-T4HHBUTO MINGW64 ~/Desktop/lab02/alice/project (master) $ git add main.cpp

повторная проверка статуса рабочей копии после добавление файла в индекс: Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/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

создание коммита с файлом, добавленным в индекс: Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02/alice/project (master) $ git commit -m 'code: заготовка программы' [master (root-commit) 027cf52] code: заготовка программы 1 file changed, 9 insertions(+) create mode 100644 main.cpp

повторная проверка статуса рабочей копии: Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02/alice/project (master) $ git status On branch master Untracked files: (use "git add ..." to include in what will be committed) bin/ obj/ project.cbp

nothing added to commit but untracked files present (use "git add" to track)

добавление файла в индекс: Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02/alice/project (master) $ 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-T4HHBUTO MINGW64 ~/Desktop/lab02/alice/project (master) $ git commit -m 'build: добавлен файл проекта' [master 9c6c28b] build: добавлен файл проекта 1 file changed, 40 insertions(+) create mode 100644 project.cbp

повторная поверка статуса: Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02/alice/project (master) $ git status On branch master Untracked files: (use "git add ..." to include in what will be committed) bin/ obj/

nothing added to commit but untracked files present (use "git add" to track)

изменила код программы добавила все изменения в индекс: Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02/alice/project (master) $ git add -u

создала ещё один коммит: Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02/alice/project (master) $ git commit -m 'code: доработка (+/-)01' [master 35a3902] code: доработка (+/-)01 1 file changed, 2 insertions(+), 1 deletion(-)

создание файла (empty) .gitignore, выполняющий функцию игнорирования файлов: /bin /obj /project.layout

проверка статуса рабочей копии: Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02/alice/project (master) $ git status On branch master Untracked files: (use "git add ..." to include in what will be committed) .gitignore

nothing added to commit but untracked files present (use "git add" to track)

добавление файла в индекс и создание комиита: Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02/alice/project (master) $ git add .gitignore

Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02/alice/project (master) $ git commit -m 'git: игнорирование файлов' [master d3ec1fd] git: игнорирование файлов 1 file changed, 3 insertions(+) create mode 100644 .gitignore

просмотр истории, журнал репозитария: Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02/alice/project (master) $ git log commit d3ec1fd09f (HEAD -> master) Author: Alice (KriviAS) KriviAS@mpei.ru Date: Sun Mar 24 20:59:12 2024 +0300

git: игнорирование файлов

commit 35a3902727 Author: Alice (KriviAS) KriviAS@mpei.ru Date: Sun Mar 24 20:43:51 2024 +0300

code: доработка (+/-)01

commit c29d4f2057 Author: Alice (KriviAS) KriviAS@mpei.ru Date: Sun Mar 24 20:42:48 2024 +0300

code: доработка (+/-)

commit 9c6c28b0d0 Author: Alice (KriviAS) KriviAS@mpei.ru Date: Sun Mar 24 20:14:09 2024 +0300

build: добавлен файл проекта

просмотр изменений, затрагивающих файл:

Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02/alice/project (master) $ git log -- project.cbp commit 9c6c28b0d0 Author: Alice (KriviAS) KriviAS@mpei.ru Date: Sun Mar 24 20:14:09 2024 +0300

build: добавлен файл проекта

коммиты с build: Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02/alice/project (master) $ git log -- grep 'build:'

commit 9c6c28b0d0 Author: Alice (KriviAS) KriviAS@mpei.ru Date: Sun Mar 24 20:14:09 2024 +0300

build: добавлен файл проекта

просмотр предпоследнего коммита: способ 1 Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02/alice/project (master) $ git show HEAD~1 commit 35a3902727 Author: Alice (KriviAS) KriviAS@mpei.ru Date: Sun Mar 24 20:43:51 2024 +0300

code: доработка (+/-)01

diff --git a/main.cpp b/main.cpp index 2fbd623..8435233 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';
  

}

способ 2 Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02/alice/project (master) $ git show master~1 commit 35a3902727 Author: Alice (KriviAS) KriviAS@mpei.ru Date: Sun Mar 24 20:43:51 2024 +0300

code: доработка (+/-)01

diff --git a/main.cpp b/main.cpp index 2fbd623..8435233 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';
  

}

способ 3 Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02/alice/project (master) $ git show 2fbd623 #include

using namespace std;

int main() { cout << "Enter A and B: "; int a, b; cin >> a >> b; cout << a+b; }

внесла изменения в код программы main.cpp(произведение чисел) просмотр изменений в рабочей копии: Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02/alice/project (master) $ git diff diff --git a/main.cpp b/main.cpp index 8435233..f372c78 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';
  

}

разница между коммитами:

Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02/alice/project (master) $ git diff HEAD~2 HEAD diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..bdcd1e7 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +/bin +/obj +/project.layout \ No newline at end of file diff --git a/main.cpp b/main.cpp index 2fbd623..8435233 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';
  

}

Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02/alice/project (master) $ git add main.cpp

Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02/alice/project (master) $ git commit -m 'code: доработка (*)' On branch master nothing to commit, working tree clean

создание ключей: Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02/alice/project (master) $ ssh-keygen Generating public/private ed25519 key pair. Enter file in which to save the key (/c/Users/Сергей/.ssh/id_ed25519): Created directory '/c/Users/\320\241\320\265\321\200\320\263\320\265\320\271/.ssh'. Enter passphrase (empty for no passphrase): Enter same passphrase again: Passphrases do not match. Try again. Enter passphrase (empty for no passphrase): Enter same passphrase again: Your identification has been saved in /c/Users/Сергей/.ssh/id_ed25519 Your public key has been saved in /c/Users/Сергей/.ssh/id_ed25519.pub The key fingerprint is: SHA256:kFXyG5fF+MZp2tctC9m5w3Vk/KFKYx2WI+d6nBEFVRo Сергей@LAPTOP-T4HHBUTO The key's randomart image is: +--[ED25519 256]--+ | o.. +E.o| | o o .o.+ | | o o oo+o | | . = B*.+| | S . B=+=| | ++== B| | o =oo.| | o += | | . . | +----[SHA256]-----+

запуск агента: Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02/alice/project (master) eval(ssh-agent -s) Agent pid 1623

загрузка ключа: Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02/alice/project (master) $ ssh-add Enter passphrase for /c/Users/Сергей/.ssh/id_ed25519: Identity added: /c/Users/Сергей/.ssh/id_ed25519 (Сергей@LAPTOP-T4HHBUTO)

отображение ключа с помощью...: Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02/alice/project (master) $ cat ~/.ssh/id_ed25519.pub ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINL6u7DOo1M56e4jiVakD23nis3jRBpSOibK97Xegip9 Сергей@LAPTOP-T4HHBUTO

подключение сервера: Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02/alice/project (main) $ git remote add origin git@uit.mpei.ru:KriviAS/cs-lab02.git

Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02/alice/project (main) $ git push -u origin main ssh: connect to host uit.mpei.ru port 22: Connection timed out fatal: Could not read from remote repository.

Please make sure you have the correct access rights and the repository exists.

отсутствие подключения к серверу

Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02/alice/project (main) $ git remote set-url origin http://uit.mpei.ru/git/KriviAS/cs-lab02.git

Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02/alice/project (main) $ git push -u origin main warning: auto-detection of host provider took too long (>2000ms) warning: see https://aka.ms/gcm/autodetect for more information. fatal: User cancelled dialog. error: unable to read askpass response from 'D:/Git/mingw64/bin/git-askpass.exe' Password for 'http://f2n-QxH-Xz9-6as@uit.mpei.ru': warning: auto-detection of host provider took too long (>2000ms) warning: see https://aka.ms/gcm/autodetect for more information. remote: Verify fatal: Authentication failed for 'http://uit.mpei.ru/git/KriviAS/cs-lab02.git/'

Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02/alice/project (main) $ git push -u origin main fatal: User cancelled dialog. Enumerating objects: 18, done. Counting objects: 100% (18/18), done. Delta compression using up to 8 threads Compressing objects: 100% (15/15), done. Writing objects: 100% (18/18), 2.22 KiB | 283.00 KiB/s, done. Total 18 (delta 2), reused 0 (delta 0), pack-reused 0 (from 0) remote: . Processing 1 references remote: Processed 1 references in total To http://uit.mpei.ru/git/KriviAS/cs-lab02.git

• [new branch] main -> main branch 'main' set up to track 'origin/main'.

работа Боба: Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02/bob $ cd project

Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02/bob/project (main) $ git config user.name 'Bob (KriviAS)'

Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02/bob/project (main) $ git config user.email 'KriviAS@mpei.ru'

Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02/bob/project (main) $ git add main.cpp

Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02/bob/project (main) $ git commit -m 'code: доработка *' [main 54660fb] code: доработка * 1 file changed, 3 insertions(+), 1 deletion(-)

просмотр истории коммитов: Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02/bob/project (main) $ git log commit 54660fbeac (HEAD -> main) Author: Bob (KriviAS) KriviAS@mpei.ru Date: Mon Mar 25 00:13:18 2024 +0300

code: доработка *

commit 5d3f2759f7 (origin/main, origin/HEAD) Author: Alice (KriviAS) KriviAS@mpei.ru Date: Sun Mar 24 23:36:25 2024 +0300

first commit

commit d3ec1fd09f Author: Alice (KriviAS) KriviAS@mpei.ru Date: Sun Mar 24 20:59:12 2024 +0300

git: игнорирование файлов

commit 35a3902727 Author: Alice (KriviAS) KriviAS@mpei.ru Date: Sun Mar 24 20:43:51 2024 +0300

code: доработка (+/-)01

:

загрузка изменений на машине алисы: Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/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), 325 bytes | 5.00 KiB/s, done. From http://uit.mpei.ru/git/KriviAS/cs-lab02 5d3f275..54660fb main -> origin/main

просмотр истории всех веток: Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02/alice/project (main) $ git log --oneline --decorate --all --graph

• 54660fb (origin/main) code: доработка *
• 5d3f275 (HEAD -> main) first commit
• d3ec1fd (master) git: игнорирование файлов
• 35a3902 code: доработка (+/-)01
• c29d4f2 code: доработка (+/-)
• 9c6c28b build: добавлен файл проекта
• 027cf52 code: заготовка программы

ветка main отстает на один коммит от ветки origin/main

Продвижение ветки main к скачанной версии: Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02/alice/project (main) $ git pull --ff-only Updating 5d3f275..54660fb Fast-forward main.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

отправка изменений на сервер: Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02/alice/project (main) $ git pull Already up to date.

создание коммита max на машине алиса: Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02/alice/project (main) $ git add main.cpp

Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02/alice/project (main) $ git commit -m 'code: доработка MAX' [main c4c313b] code: доработка MAX 1 file changed, 7 insertions(+)

отправка изменений: Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/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), 367 bytes | 367.00 KiB/s, done. Total 3 (delta 2), reused 0 (delta 0), pack-reused 0 (from 0) remote: . Processing 1 references remote: Processed 1 references in total To http://uit.mpei.ru/git/KriviAS/cs-lab02.git 7aa0ffd..c4c313b main -> main

добавление min: Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02/bob/project (main) $ git add main.cpp

Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02/bob/project (main) $ git commit -m 'code: доработка MIN' [main 43d06b5] code: доработка MIN 1 file changed, 6 insertions(+), 1 deletion(-)

Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02/bob/project (main) $ git push To http://uit.mpei.ru/git/KriviAS/cs-lab02.git ! [rejected] main -> main (fetch first) error: failed to push some refs to 'http://uit.mpei.ru/git/KriviAS/cs-lab02.git' hint: Updates were rejected because the remote contains work that you do not hint: have locally. This is usually caused by another repository pushing to hint: the same ref. If you want to integrate the remote changes, use hint: 'git pull' before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details.

загрузка изменений: Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02/bob/project (main) $ git fetch 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), 629 bytes | 14.00 KiB/s, done. From http://uit.mpei.ru/git/KriviAS/cs-lab02 54660fb..c4c313b main -> origin/main

Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02/bob/project (main) $ git push To http://uit.mpei.ru/git/KriviAS/cs-lab02.git ! [rejected] main -> main (non-fast-forward) error: failed to push some refs to 'http://uit.mpei.ru/git/KriviAS/cs-lab02.git' hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. If you want to integrate the remote changes, hint: use 'git pull' before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details.

Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02/bob/project (main) $ git log --oneline --decorate --all --graph

• 43d06b5 (HEAD -> main) code: доработка MIN
• c4c313b (origin/main, origin/HEAD) code: доработка MAX
• 7aa0ffd code: доработка /
• 54660fb code: доработка *
• 5d3f275 first commit
• d3ec1fd git: игнорирование файлов
• 35a3902 code: доработка (+/-)01
• c29d4f2 code: доработка (+/-)
• 9c6c28b build: добавлен файл проекта
• 027cf52 code: заготовка программы

Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02/alice/project (main) $ git branch double

Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02/alice/project (main) $ git checkout double Switched to branch 'double'

Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02/alice/project (double) $ git add main.cpp

Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02/alice/project (double) $ git commit -m 'code: доработка double' [double 3d49fdb] code: доработка double 1 file changed, 1 insertion(+), 1 deletion(-)

Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02/alice/project (double) $ git push fatal: The current branch double has no upstream branch. To push the current branch and set the remote as upstream, use

git push --set-upstream origin double

To have this happen automatically for branches without a tracking upstream, see 'push.autoSetupRemote' in 'git help config'.

Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02/alice/project (double) $ git log --oneline --decorate --all --graph

• 3d49fdb (HEAD -> double) code: доработка double
• c4c313b (origin/main, main) code: доработка MAX
• 7aa0ffd code: доработка /
• 54660fb code: доработка *
• 5d3f275 first commit
• d3ec1fd (master) git: игнорирование файлов
• 35a3902 code: доработка (+/-)01
• c29d4f2 code: доработка (+/-)
• 9c6c28b build: добавлен файл проекта
• 027cf52 code: заготовка программы

Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02/alice/project (double) $ git checkout main Switched to branch 'main' Your branch is up to date with 'origin/main'.

Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02/alice/project (main) $ git push Everything up-to-date

Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02/alice/project (main) $ git log --oneline --decorate --all --graph

• 3d49fdb (double) code: доработка double
• c4c313b (HEAD -> main, origin/main) code: доработка MAX
• 7aa0ffd code: доработка /
• 54660fb code: доработка *
• 5d3f275 first commit
• d3ec1fd (master) git: игнорирование файлов
• 35a3902 code: доработка (+/-)01
• c29d4f2 code: доработка (+/-)
• 9c6c28b build: добавлен файл проекта
• 027cf52 code: заготовка программы

слить ветку: Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02/alice/project (main) $ git merge double Updating c4c313b..3d49fdb Fast-forward main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/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), 325 bytes | 325.00 KiB/s, done. Total 3 (delta 2), reused 0 (delta 0), pack-reused 0 (from 0) remote: . Processing 1 references remote: Processed 1 references in total To http://uit.mpei.ru/git/KriviAS/cs-lab02.git c4c313b..3d49fdb main -> main

Сергей@LAPTOP-T4HHBUTO MINGW64 ~/Desktop/lab02/alice/project (main) $ git log --oneline --decorate --all --graph

• 3d49fdb (HEAD -> main, origin/main, double) code: доработка double
• c4c313b code: доработка MAX
• 7aa0ffd code: доработка /
• 54660fb code: доработка *
• 5d3f275 first commit
• d3ec1fd (master) git: игнорирование файлов
• 35a3902 code: доработка (+/-)01
• c29d4f2 code: доработка (+/-)
• 9c6c28b build: добавлен файл проекта
• 027cf52 code: заготовка программы