Родитель
d13b3e776f
Сommit
10c5a6ecce
@ -0,0 +1,962 @@
|
||||
1. Вход в терминал и создание структуры каталогов
|
||||
-Создание папки с названием «Лаба_2» на рабочем столе
|
||||
-Запуск Git Bash
|
||||
|
||||
Иван@AsusTUF MINGW64
|
||||
$ pwd
|
||||
/c/Users/Иван
|
||||
Иван@AsusTUF MINGW64
|
||||
$ cd C:/Users/Иван/Desktop/Лаба_2
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/Лаба_2
|
||||
$
|
||||
|
||||
-Просмотр файлов в каталоге с помощью команды ls
|
||||
|
||||
Иван@AsusTUF MINGW64 -/Desktop/Лаба_2 $ 1s
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/Лаба_2
|
||||
$
|
||||
|
||||
-Создание папок «Лаба_2/alice» и «Лаба_2/bob»
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/Лаба_2 $ mokdir alics
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/Лаба_2 $ mkdir bob
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/Лаба_2 $
|
||||
|
||||
-Переход на «компьютер Алисы»
|
||||
Иван@AssTUMINGW64 ~/Desktop/Лаба_2 $ cd alics
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/Лаба_2/alice S
|
||||
|
||||
-Создание каталога project и переход к нему
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/Лаба_2/alics S mkdir project
|
||||
Иван@AsusTUF MINGW64 -/Desktop/Лаба_2/alics cd project
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/Лаба_2/alice/project $
|
||||
-Переход из каталога вверх
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/Лаба_2/alics/project $ cd …
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/Лаба_2/alics
|
||||
$
|
||||
|
||||
-Переход обратно к project
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/Лаба_2/alice $ cd project
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/Лаба_2/alice/project
|
||||
|
||||
2. Инициализация репозитария и настройка Git
|
||||
-Инициализация репозитария в текущем каталоге (project)
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/Лаба_2/alice/wsaeet S git init
|
||||
Initialized empty Git repository in
|
||||
C:/Users/Иван/Desktop/Лаба_2/alice/project/.git/
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/Лаба_2/alice/project (master)
|
||||
$
|
||||
|
||||
-Переименование ветки в main
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/Лаба_2/alice/project (master) S git branch -m main
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/Лаба_2/alice/project (main)
|
||||
|
||||
-Настройка репозитория Алисы
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/Лаба_2/alice/project (main) S git config user.name "Alice (BelozsrovIA)"
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/Лаба_2/alice/project (main) S git config usetsmail " BeloziorovIA@mpei.ru "
|
||||
Иван@AsusTUF MINGW64 -/Desktop/Лаба_2/alice/project (main) S
|
||||
|
||||
3. Создание комитов
|
||||
-Создание проекта в репозитории Алисы
|
||||
4. Занесение файлов под контроль версий
|
||||
-Просмотр состояния рабочей копии
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$ git status
|
||||
On branch main //в ветке main
|
||||
|
||||
No commits yet //комиты отсутсвуют
|
||||
|
||||
Untracked files: //неотслеживаемые файлы
|
||||
(use "git add <file>..." to include in what will be committed) добавьте файлы чтобы потом их закомитить
|
||||
bin/
|
||||
main.cpp
|
||||
obj/
|
||||
project.cbp
|
||||
project.layout
|
||||
|
||||
nothing added to commit but untracked files present (use "git add" to track) //необходимо добавить файлы с помощью add
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$
|
||||
|
||||
- Добавление файла main.cpp
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$ git add main.cpp
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$
|
||||
|
||||
- Проверка состояния рабочей копии
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$ git status
|
||||
On branch main
|
||||
|
||||
No commits yet
|
||||
|
||||
Changes to be committed:
|
||||
(use "git rm --cached <file>..." to unstage)
|
||||
new file: main.cpp
|
||||
|
||||
Untracked files:
|
||||
(use "git add <file>..." to include in what will be committed)
|
||||
bin/
|
||||
obj/
|
||||
project.cbp
|
||||
project.layout
|
||||
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$
|
||||
|
||||
-Выполнение комита с файлом main.cpp
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$ git commit -m 'code: заготовка программы'
|
||||
[main (root-commit) 54952bc] code: заготовка программы
|
||||
1 file changed, 9 insertions(+)
|
||||
create mode 100644 main.cpp
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$
|
||||
|
||||
5. Составление сообщений к комитам
|
||||
-Добавление project.cbp в индекс
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/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
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$
|
||||
|
||||
-Проверка состояния рабочей копии
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$ git status
|
||||
On branch main
|
||||
Changes to be committed:
|
||||
(use "git restore --staged <file>..." to unstage)
|
||||
new file: project.cbp
|
||||
|
||||
Untracked files:
|
||||
(use "git add <file>..." to include in what will be committed)
|
||||
bin/
|
||||
obj/
|
||||
project.layout
|
||||
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$
|
||||
|
||||
-Создание комита с project.cbp
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$ git commit -m 'build: добавление файла проекта'
|
||||
[main 1a5fa86] build: добавление файла проекта
|
||||
1 file changed, 40 insertions(+)
|
||||
create mode 100644 project.cbp
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$
|
||||
|
||||
6. Создание комитов с изменениями
|
||||
-Изменение файла main.cpp
|
||||
-Проверка состояния рабочей копии
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$ git status
|
||||
On branch main
|
||||
Changes not staged for commit:
|
||||
(use "git add <file>..." to update what will be committed)
|
||||
(use "git restore <file>..." to discard changes in working directory)
|
||||
modified: main.cpp
|
||||
|
||||
Untracked files:
|
||||
(use "git add <file>..." to include in what will be committed)
|
||||
bin/
|
||||
obj/
|
||||
project.layout
|
||||
|
||||
no changes added to commit (use "git add" and/or "git commit -a")
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$
|
||||
|
||||
-Добавление файла main.cpp с изменениями
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$ git add main.cpp
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$
|
||||
|
||||
-Создание комита с измененным main.cpp
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$ git commit -m 'code: ввод a и b'
|
||||
[main 528b6ae] code: ввод a и b
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$
|
||||
|
||||
-Добаавление вывода суммы в main.cpp
|
||||
-Добавление всех изменённых файлов (main.cpp)
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$ git add -u
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$
|
||||
-Создание комита с изменённым main.cpp
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$ git commit -m 'code: вывод суммы a и b'
|
||||
[main 6806a6c] code: вывод суммы a и b
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$
|
||||
|
||||
-Добавление вывода разности
|
||||
-Создание комита с изменённым main.cpp
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$ git commit -a -m 'code: вывод разности a и b'
|
||||
[main e0d2612] code: вывод разности a и b
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$
|
||||
|
||||
7. Игнорирование файлов
|
||||
-создание файла .gitignore
|
||||
-проверка состояния рабочей копии
|
||||
|
||||
Иван@AsusTUF MINGW64 /C/Users/Иван/Desktop/JIa6a_2/alice/project (main)
|
||||
$ git status
|
||||
On branch main
|
||||
Untracked files:
|
||||
(use "git add <file>..." to include in what will be committed)
|
||||
.gitignore
|
||||
obj/
|
||||
project.layout
|
||||
|
||||
nothing added to commit but untracked files present (use "git add" to track)
|
||||
|
||||
Иван@AsusTUF MINGW64 /C/Users/Иван/Desktop/JIa6a_2/alice/project (main)
|
||||
$
|
||||
|
||||
-добавление в .gitignore /obj *.layout
|
||||
-добавления файла .gitignore
|
||||
Иван@AsusTUF MINGW64 /C/Users/Иван/Desktop/JIa6a_2/alice/project (main)
|
||||
$ git add .gitignore
|
||||
|
||||
Иван@AsusTUF MINGW64 /C/Users/Иван/Desktop/JIa6a_2/alice/project (main)
|
||||
$
|
||||
|
||||
-Создание комита
|
||||
|
||||
Иван@AsusTUF MINGW64 /C/Users/Иван/Desktop/JIa6a_2/alice/project (main)
|
||||
$ git commit -m "git: добавления файла .gitignore"
|
||||
[main f5ed43f] git: добавления файла .gitignore
|
||||
1 file changed, 3 insertions(+)
|
||||
create mode 100644 .gitignore
|
||||
|
||||
Иван@AsusTUF MINGW64 /C/Users/Иван/Desktop/JIa6a_2/alice/project (main)
|
||||
$
|
||||
|
||||
8. Просмотр истории
|
||||
1) Работа с журналом
|
||||
-ввод команды git log
|
||||
|
||||
Иван@AsusTUF MINGW64 /C/Users/Иван/Desktop/JIa6a_2/alice/project (main)
|
||||
$ git log --stat
|
||||
commit f5ed43f488be4bd8b6d1422319fa0df67c3ddc2a (HEAD -> main)
|
||||
Author: Alice (BelozerovIA) <BeloziorovIA@mpei.ru>
|
||||
Date: Mon Mar 31 14:53:42 2025 +0300
|
||||
|
||||
git: добавления файла .gitignore
|
||||
|
||||
.gitignore | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
-коммиты по теме build
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$ git log --grep "build: "
|
||||
commit 1a5fa86cac10cd000f4b5e5c3cb78784cf9f6445
|
||||
Author: Alice (BelozerovIA) <BeloziorovIA@mpei.ru>
|
||||
Date: Mon Mar 24 14:51:46 2025 +0300
|
||||
|
||||
build: добавление файла проекта
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$
|
||||
|
||||
-коммиты касающиеся project.cbp
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$ git log project.cbp
|
||||
commit 1a5fa86cac10cd000f4b5e5c3cb78784cf9f6445
|
||||
Author: Alice (BelozerovIA) <BeloziorovIA@mpei.ru>
|
||||
Date: Mon Mar 24 14:51:46 2025 +0300
|
||||
|
||||
build: добавление файла проекта
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$
|
||||
|
||||
2) Просмотр коммитов
|
||||
-Просмотр предпоследнего коммита
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$ git show HEAD~1
|
||||
commit e0d2612d8dc5862de32d1415d7605769c18221cd
|
||||
Author: Alice (BelozerovIA) <BeloziorovIA@mpei.ru>
|
||||
Date: Mon Mar 24 15:21:03 2025 +0300
|
||||
|
||||
code: вывод разности a и b
|
||||
|
||||
diff --git a/main.cpp b/main.cpp
|
||||
index c670cbd..8675ae4 100644
|
||||
--- a/main.cpp
|
||||
+++ b/main.cpp
|
||||
@@ -8,5 +8,6 @@ int main()
|
||||
int a, b;
|
||||
cin >> a >> b;
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$
|
||||
|
||||
3) Просмотр изменений
|
||||
-Добавление печать печать произведения чисел в main.cpp
|
||||
-git diff
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$ git diff
|
||||
diff --git a/main.cpp b/main.cpp
|
||||
index 8675ae4..ae8e1ea 100644
|
||||
--- a/main.cpp
|
||||
+++ b/main.cpp
|
||||
@@ -9,5 +9,6 @@ int main()
|
||||
cin >> a >> b;
|
||||
cout << "A + B = " << a+b << "\n";
|
||||
cout << "A - B = " << a-b << "\n";
|
||||
+ cout << "A * B = " << a*b << "\n";
|
||||
return 0;
|
||||
}
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$
|
||||
|
||||
-Просмотр изменений между 1-м коммитом и коммитом вывода разности
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$ git diff 54952bc e0d2612
|
||||
diff --git a/main.cpp b/main.cpp
|
||||
index 69af013..8675ae4 100644
|
||||
--- a/main.cpp
|
||||
+++ b/main.cpp
|
||||
@@ -4,6 +4,10 @@ using namespace std;
|
||||
|
||||
int main()
|
||||
{
|
||||
- //cout << "Hello world!" << endl;
|
||||
+ cout << "Enter A and B: ";
|
||||
+ int a, b;
|
||||
+ cin >> a >> b;
|
||||
+ cout << "A + B = " << a+b << "\n";
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$
|
||||
|
||||
9. Откат изменений
|
||||
-Создание коммита с изменённым main.cpp
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$ git add main.cpp
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$ git commit -m "code: вывод произведения a и b"
|
||||
[main cf63844] code: вывод произведения a и b
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$
|
||||
|
||||
-откат рабочей копии на комит назад
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$ git reset --hard HEAD~1
|
||||
HEAD is now at f5ed43f git: добавления файла .gitignore
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$
|
||||
|
||||
-Добавляем комментарий в main.cpp
|
||||
-Откатываем файл к состоянию в последнем коммите
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$ git checkout HEAD -- main.cpp
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$
|
||||
|
||||
10. Обмен кодом через удаленное хранилище
|
||||
-Создание ключей
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$ ssh-keygen -t ed25519 -f "/c/Users/Иван/.ssh/id_ed25519"
|
||||
Generating public/private ed25519 key pair.
|
||||
Enter passphrase for "/c/Users/Иван/.ssh/id_ed25519" (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:iLaLVbqvQorDFfsXqQA8B9eVmubo/vYe36iEE3T+rBU Иван@AsusTUF
|
||||
The key's randomart image is:
|
||||
+--[ED25519 256]--+
|
||||
| . ... |
|
||||
| . . . . |
|
||||
|. o .o. |
|
||||
| + o.=o. |
|
||||
| + O.o.SE |
|
||||
| .* =ooo . |
|
||||
|ooo *o.o.+ |
|
||||
|+..+ *o.= o |
|
||||
| .oo*+==.o . |
|
||||
+----[SHA256]-----+
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$
|
||||
|
||||
-запуск агента
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$ eval $(ssh-agent -s)
|
||||
Agent pid 1325
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$
|
||||
|
||||
-загрузка ключей
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$ ssh-add
|
||||
Enter passphrase for /c/Users/Иван/.ssh/id_ed25519:
|
||||
Identity added: /c/Users/Иван/.ssh/id_ed25519 (Иван@AsusTUF)
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$
|
||||
|
||||
-отбражение открытого ключа
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$ cat ~/.ssh/id_ed25519.pub
|
||||
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE3FE3X4g2eGQwHJ+58C4mUlkK1FhsxRbLvBLvFhZrHO Иван@AsusTUF
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$
|
||||
|
||||
10. Отправка проекта на сервер
|
||||
-Создание репозитория
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$ git remote add origin git@uit.mpei.ru:BeloziorovIA/cs-lab02.git
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/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: 18, done.
|
||||
Counting objects: 100% (18/18), done.
|
||||
Delta compression using up to 12 threads
|
||||
Compressing objects: 100% (16/16), done.
|
||||
Writing objects: 100% (18/18), 2.32 KiB | 792.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 uit.mpei.ru:BeloziorovIA/cs-lab02.git
|
||||
* [new branch] main -> main
|
||||
branch 'main' set up to track 'origin/main'.
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$
|
||||
|
||||
11. Получение проекта с сервера
|
||||
-Клонирование проекта
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/bob
|
||||
$ git clone git@uit.mpei.ru:BeloziorovIA/cs-lab02.git project
|
||||
Cloning into 'project'...
|
||||
Enter passphrase for key '/c/Users/Иван/.ssh/id_ed25519':
|
||||
remote: Enumerating objects: 18, done.
|
||||
remote: Counting objects: 100% (18/18), done.
|
||||
remote: Compressing objects: 100% (16/16), done.
|
||||
remote: Total 18 (delta 2), reused 0 (delta 0), pack-reused 0
|
||||
Receiving objects: 100% (18/18), done.
|
||||
Resolving deltas: 100% (2/2), done.
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/bob
|
||||
$
|
||||
|
||||
-настройка Git
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/bob/project (main)
|
||||
$ git config user.name "Bob (BeloziorovIA)"
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/bob/project (main)
|
||||
$ git config user.email "BeloziorovIA.mpei.ru@"
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/bob/project (main)
|
||||
$
|
||||
|
||||
12. Совместная работа над проектом без конфликтов правок
|
||||
-Добавление вывода произведения чисел
|
||||
-Создание коммита вывода произведения Бобом
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/bob/project (main)
|
||||
$ git commit -m "code: вывод произведения"
|
||||
[main bf54948] code: вывод произведения
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/bob/project (main)
|
||||
$
|
||||
|
||||
-Отправка коммита на сервер
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/bob/project (main)
|
||||
$ git push
|
||||
Enter passphrase for key '/c/Users/Иван/.ssh/id_ed25519':
|
||||
Enumerating objects: 5, done.
|
||||
Counting objects: 100% (5/5), done.
|
||||
Delta compression using up to 12 threads
|
||||
Compressing objects: 100% (3/3), done.
|
||||
Writing objects: 100% (3/3), 411 bytes | 411.00 KiB/s, done.
|
||||
Total 3 (delta 1), reused 0 (delta 0), pack-reused 0 (from 0)
|
||||
remote: . Processing 1 references
|
||||
remote: Processed 1 references in total
|
||||
To uit.mpei.ru:BeloziorovIA/cs-lab02.git
|
||||
f5ed43f..bf54948 main -> main
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/bob/project (main)
|
||||
$
|
||||
|
||||
-Загрузка изменений в машину Алисы
|
||||
-Просмотр истории всех веток
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$ git log --oneline --decorate --all --graph
|
||||
* bf54948 (origin/main, origin/HEAD) code: вывод произведения
|
||||
* f5ed43f (HEAD -> main) git: добавления файла .gitignore
|
||||
* e0d2612 code: вывод разности a и b
|
||||
* 6806a6c code: вывод суммы a и b
|
||||
* 528b6ae code: ввод a и b
|
||||
* 1a5fa86 build: добавление файла проекта
|
||||
* 54952bc code: заготовка программы
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$
|
||||
|
||||
-Продвижение ветки main
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$ git pull --ff-only
|
||||
Enter passphrase for key '/c/Users/Иван/.ssh/id_ed25519':
|
||||
Updating f5ed43f..bf54948
|
||||
Fast-forward
|
||||
main.cpp | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$
|
||||
|
||||
-Создание коммита с выводом частного
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$ git add main.cpp
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$ git commit -m "code: вывод частного"
|
||||
[main 67db6e5] code: вывод частного
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$
|
||||
|
||||
-отправка комита
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$ git push
|
||||
Enter passphrase for key '/c/Users/Иван/.ssh/id_ed25519':
|
||||
Enumerating objects: 5, done.
|
||||
Counting objects: 100% (5/5), done.
|
||||
Delta compression using up to 12 threads
|
||||
Compressing objects: 100% (3/3), done.
|
||||
Writing objects: 100% (3/3), 418 bytes | 418.00 KiB/s, done.
|
||||
Total 3 (delta 1), reused 0 (delta 0), pack-reused 0 (from 0)
|
||||
remote: . Processing 1 references
|
||||
remote: Processed 1 references in total
|
||||
To uit.mpei.ru:BeloziorovIA/cs-lab02.git
|
||||
bf54948..67db6e5 main -> main
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$
|
||||
|
||||
-Загрузка изменений Бобу
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/bob/project (main)
|
||||
$ git fetch
|
||||
Enter passphrase for key '/c/Users/Иван/.ssh/id_ed25519':
|
||||
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), 398 bytes | 49.00 KiB/s, done.
|
||||
From uit.mpei.ru:BeloziorovIA/cs-lab02
|
||||
bf54948..67db6e5 main -> origin/main
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/bob/project (main)
|
||||
$
|
||||
|
||||
-передвижение ветки
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/bob/project (main)
|
||||
$ git pull --ff-only
|
||||
Enter passphrase for key '/c/Users/Иван/.ssh/id_ed25519':
|
||||
Updating bf54948..67db6e5
|
||||
Fast-forward
|
||||
main.cpp | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/bob/project (main)
|
||||
$
|
||||
|
||||
13. Разрешение конфликтов правок при совместной работе
|
||||
-переделка кода в НАДЛЕЖАЩИЙ вид
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/bob/project (main)
|
||||
$ git add main.cpp
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/bob/project (main)
|
||||
$ git commit -m "code: передлка под нужный вид, о котором нигде не говорилось"
|
||||
[main 821572a] code: передлка под нужный вид, о котором нигде не говорилось
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/bob/project (main)
|
||||
$ git push
|
||||
Enter passphrase for key '/c/Users/Иван/.ssh/id_ed25519':
|
||||
Enumerating objects: 5, done.
|
||||
Counting objects: 100% (5/5), done.
|
||||
Delta compression using up to 12 threads
|
||||
Compressing objects: 100% (3/3), done.
|
||||
Writing objects: 100% (3/3), 441 bytes | 441.00 KiB/s, done.
|
||||
Total 3 (delta 1), reused 0 (delta 0), pack-reused 0 (from 0)
|
||||
remote: . Processing 1 references
|
||||
remote: Processed 1 references in total
|
||||
To uit.mpei.ru:BeloziorovIA/cs-lab02.git
|
||||
67db6e5..821572a main -> main
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$ git fetch
|
||||
Enter passphrase for key '/c/Users/Иван/.ssh/id_ed25519':
|
||||
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), 421 bytes | 60.00 KiB/s, done.
|
||||
From uit.mpei.ru:BeloziorovIA/cs-lab02
|
||||
67db6e5..821572a main -> origin/main
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$ git pull --ff-only
|
||||
Enter passphrase for key '/c/Users/Иван/.ssh/id_ed25519':
|
||||
Updating 67db6e5..821572a
|
||||
Fast-forward
|
||||
main.cpp | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$
|
||||
|
||||
-создание коммита с выводом максимума и его отправка
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$ git commit -m "code: вывод максимума"
|
||||
[main 037c71f] code: вывод максимума
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$ git push
|
||||
Enter passphrase for key '/c/Users/Иван/.ssh/id_ed25519':
|
||||
Enumerating objects: 5, done.
|
||||
Counting objects: 100% (5/5), done.
|
||||
Delta compression using up to 12 threads
|
||||
Compressing objects: 100% (3/3), done.
|
||||
Writing objects: 100% (3/3), 441 bytes | 441.00 KiB/s, done.
|
||||
Total 3 (delta 1), reused 0 (delta 0), pack-reused 0 (from 0)
|
||||
remote: . Processing 1 references
|
||||
remote: Processed 1 references in total
|
||||
To uit.mpei.ru:BeloziorovIA/cs-lab02.git
|
||||
821572a..037c71f main -> main
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$
|
||||
|
||||
-создание коммита с выводом минимума
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/bob/project (main)
|
||||
$ git add main.cpp
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/bob/project (main)
|
||||
$ git commit -m "code: вывод минимума"
|
||||
[main dd60eb1] code: вывод минимума
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/bob/project (main)
|
||||
$
|
||||
|
||||
-Попытка отправки
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/bob/project (main)
|
||||
$ git push
|
||||
Enter passphrase for key '/c/Users/Иван/.ssh/id_ed25519':
|
||||
To uit.mpei.ru:BeloziorovIA/cs-lab02.git
|
||||
! [rejected] main -> main (non-fast-forward)
|
||||
error: failed to push some refs to 'uit.mpei.ru:BeloziorovIA/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.
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/bob/project (main)
|
||||
$
|
||||
|
||||
-загрузка изменений и
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/bob/project (main)
|
||||
$ git fetch
|
||||
Enter passphrase for key '/c/Users/Иван/.ssh/id_ed25519':
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/bob/project (main)
|
||||
$ git log --oneline --decorate --all --graph
|
||||
* dd60eb1 (HEAD -> main) code: вывод минимума
|
||||
| * 037c71f (origin/main, origin/HEAD) code: вывод максимума
|
||||
|/
|
||||
* 821572a code: передлка под нужный вид, о котором нигде не говорилось
|
||||
* 67db6e5 code: вывод частного
|
||||
* bf54948 code: вывод произведения
|
||||
* f5ed43f git: добавления файла .gitignore
|
||||
* e0d2612 code: вывод разности a и b
|
||||
* 6806a6c code: вывод суммы a и b
|
||||
* 528b6ae code: ввод a и b
|
||||
* 1a5fa86 build: добавление файла проекта
|
||||
* 54952bc code: заготовка программы
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/bob/project (main)
|
||||
$
|
||||
|
||||
-Применение rebase
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/bob/project (main)
|
||||
$ git rebase origin/main
|
||||
Auto-merging main.cpp
|
||||
CONFLICT (content): Merge conflict in main.cpp
|
||||
error: could not apply dd60eb1... code: вывод минимума
|
||||
hint: Resolve all conflicts manually, mark them as resolved with
|
||||
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
|
||||
hint: You can instead skip this commit: run "git rebase --skip".
|
||||
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
|
||||
hint: Disable this message with "git config set advice.mergeConflict false"
|
||||
Could not apply dd60eb1... code: вывод минимума
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/bob/project (main|REBASE 1/1)
|
||||
$
|
||||
|
||||
-Продолжение rebase
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/bob/project (main|REBASE 1/1)
|
||||
$ git add main.cpp
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/bob/project (main|REBASE 1/1)
|
||||
$ git rebase --continue
|
||||
Successfully rebased and updated refs/heads/main.
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/bob/project (main)
|
||||
$
|
||||
|
||||
-проверка истории хранилища
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/bob/project (main)
|
||||
$ git log --oneline --decorate --all --graph
|
||||
* f09b1e1 (HEAD -> main) code: вывод минимума
|
||||
* 037c71f (origin/main, origin/HEAD) code: вывод максимума
|
||||
* 821572a code: передлка под нужный вид, о котором нигде не говорилось
|
||||
* 67db6e5 code: вывод частного
|
||||
* bf54948 code: вывод произведения
|
||||
* f5ed43f git: добавления файла .gitignore
|
||||
* e0d2612 code: вывод разности a и b
|
||||
* 6806a6c code: вывод суммы a и b
|
||||
* 528b6ae code: ввод a и b
|
||||
* 1a5fa86 build: добавление файла проекта
|
||||
* 54952bc code: заготовка программы
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/bob/project (main)
|
||||
$
|
||||
|
||||
-синхронизация изменений
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/bob/project (main)
|
||||
$ git push
|
||||
Enter passphrase for key '/c/Users/Иван/.ssh/id_ed25519':
|
||||
Enumerating objects: 5, done.
|
||||
Counting objects: 100% (5/5), done.
|
||||
Delta compression using up to 12 threads
|
||||
Compressing objects: 100% (3/3), done.
|
||||
Writing objects: 100% (3/3), 410 bytes | 410.00 KiB/s, done.
|
||||
Total 3 (delta 1), reused 0 (delta 0), pack-reused 0 (from 0)
|
||||
remote: . Processing 1 references
|
||||
remote: Processed 1 references in total
|
||||
To uit.mpei.ru:BeloziorovIA/cs-lab02.git
|
||||
037c71f..f09b1e1 main -> main
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/bob/project (main)
|
||||
$
|
||||
|
||||
14. Использование веток
|
||||
-Создание ветки double и переключение на неё
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$ git branch double
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$ git checkout double
|
||||
Switched to branch 'double'
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (double)
|
||||
$
|
||||
|
||||
-Коммит с изменением типа данных на double
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (double)
|
||||
$ git add main.cpp
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (double)
|
||||
$ git commit -m "code: изменение типа данных a и b на double"
|
||||
[double 2fd0721] code: изменение типа данных a и b на double
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (double)
|
||||
$
|
||||
|
||||
-Синхронизация main Алисы с сервером
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$ git fetch
|
||||
Enter passphrase for key '/c/Users/Иван/.ssh/id_ed25519':
|
||||
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), 390 bytes | 55.00 KiB/s, done.
|
||||
From uit.mpei.ru:BeloziorovIA/cs-lab02
|
||||
037c71f..f09b1e1 main -> origin/main
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$ git rebase origin/main
|
||||
Successfully rebased and updated refs/heads/main.
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$ git pull --ff-only
|
||||
Enter passphrase for key '/c/Users/Иван/.ssh/id_ed25519':
|
||||
Already up to date.
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$ git log --oneline --decorate --all --graph
|
||||
* 2fd0721 (double) code: изменение типа данных a и b на double
|
||||
| * f09b1e1 (HEAD -> main, origin/main, origin/HEAD) code: вывод минимума
|
||||
|/
|
||||
* 037c71f code: вывод максимума
|
||||
* 821572a code: передлка под нужный вид, о котором нигде не говорилось
|
||||
* 67db6e5 code: вывод частного
|
||||
* bf54948 code: вывод произведения
|
||||
* f5ed43f git: добавления файла .gitignore
|
||||
* e0d2612 code: вывод разности a и b
|
||||
* 6806a6c code: вывод суммы a и b
|
||||
* 528b6ae code: ввод a и b
|
||||
* 1a5fa86 build: добавление файла проекта
|
||||
* 54952bc code: заготовка программы
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$
|
||||
|
||||
-Слияние веток double и main
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main|MERGING)
|
||||
$ git merge double
|
||||
fatal: You have not concluded your merge (MERGE_HEAD exists).
|
||||
Please, commit your changes before you merge.
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main|MERGING)
|
||||
$ git add main.cpp
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main|MERGING)
|
||||
$ git commit -m "code: изменение типа данных a и b на double с помощью слияния веток main и double"
|
||||
[main d13b3e7] code: изменение типа данных a и b на double с помощью слияния веток main и double
|
||||
|
||||
-отправка изменений на сервер
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$ git push
|
||||
Enter passphrase for key '/c/Users/Иван/.ssh/id_ed25519':
|
||||
Enumerating objects: 10, done.
|
||||
Counting objects: 100% (10/10), done.
|
||||
Delta compression using up to 12 threads
|
||||
Compressing objects: 100% (6/6), done.
|
||||
Writing objects: 100% (6/6), 747 bytes | 747.00 KiB/s, done.
|
||||
Total 6 (delta 3), reused 0 (delta 0), pack-reused 0 (from 0)
|
||||
remote: . Processing 1 references
|
||||
remote: Processed 1 references in total
|
||||
To uit.mpei.ru:BeloziorovIA/cs-lab02.git
|
||||
f09b1e1..d13b3e7 main -> main
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$
|
||||
|
||||
-история всех веток репозитория
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$ git log --oneline --decorate --all --graph
|
||||
* d13b3e7 (HEAD -> main, origin/main, origin/HEAD) code: изменение типа данных a и b на double с помощью слияния веток main и double
|
||||
|\
|
||||
| * 2fd0721 (double) code: изменение типа данных a и b на double
|
||||
* | f09b1e1 code: вывод минимума
|
||||
|/
|
||||
* 037c71f code: вывод максимума
|
||||
* 821572a code: передлка под нужный вид, о котором нигде не говорилось
|
||||
* 67db6e5 code: вывод частного
|
||||
* bf54948 code: вывод произведения
|
||||
* f5ed43f git: добавления файла .gitignore
|
||||
* e0d2612 code: вывод разности a и b
|
||||
* 6806a6c code: вывод суммы a и b
|
||||
* 528b6ae code: ввод a и b
|
||||
* 1a5fa86 build: добавление файла проекта
|
||||
* 54952bc code: заготовка программы
|
||||
|
||||
Иван@AsusTUF MINGW64 ~/Desktop/JIa6a_2/alice/project (main)
|
||||
$
|
||||
Загрузка…
Ссылка в новой задаче