LekomtsevDO
/
cs-lab02
1
0
Форкнуть 0
Код Задачи Запросы на слияние Пакеты Проекты Релизы Вики Активность
Вы не можете выбрать более 25 тем Темы должны начинаться с буквы или цифры, могут содержать дефисы(-) и должны содержать не более 35 символов.
Ветки Теги
${ item.name }
Создать тег ${ searchTerm }
Создать ветку ${ searchTerm }
из 'main'
${ noResults }
cs-lab02/lab02lekom.txt

759 строки
26 KiB
Plaintext
Исходник Постоянная ссылка Вина История

Отчет по лабораторной работе № 2 "Система контроля версий Git"
Выполнил: Лекомцев Д. О.
Группа: А-01-24
Примечание: работа выполнялась на Windows.
1. Создал на рабочем столе каталог lab02 и запустил в нем Git Bash, приглашение:
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02
$
2. Просмотрел файлы в рабочем каталоге можно командой "ls" - пусто:
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02
$ ls
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02
$
3. Создал каталоги Алисы и Боба, создал каталог "project", изучил команду "cd" в процессе:
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02
$ mkdir alice
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02
$ mkdir bob
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02
$ cd bob
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02
$ cd ..
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02
$ cd alice
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/alice
$ mkdir project
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02
$ ls
project
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/alice
$ cd project
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/alice/project
$ cd ..
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/alice
$ cd project
4. Инициализировал репозитарий:
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/alice/project
$ git init
Initialized empty Git repository in C:/Users/lekom/Desktop/lab02/alice/project/.git/
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/alice/project (master)
$ git branch -m main
5. Настраиваем папки пользователя, с которым будем работать:
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/alice/project (main)
$ git config user.name 'Alice (LekomtsevDO)'
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/alice/project (main)
$ git config user.email 'LekomtsevDO@mpei.ru'
6.Создание коммитов:
Занесение файлов под контроль версий
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/alice/project (main)
$ git status
On branch main
No commits yet
Untracked files:
(use "git add <file>..." 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)
В первой строке ссылка указывает на ветку main
Вторая строка говорит о том, что еще не было создано коммитов
Третья строка показывает не отслеживаемые файлы в хранилище git, и подсказывает как их добавить
Последняя строка говорит о том, что нет добавленных (отслеживаемых) файлов, которые можно будет закоммитить
Заносим файл под Git
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/alice/project (main)
$ git add main.cpp
Еще раз просматриваем состояние рабочей копии:
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/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
Появилась строка с файлами в индексе, стоящими в очереди на коммит
7. Составление сообщений к коммитам
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/alice/project (main)
$ git commit -m 'code: заготовка программы'
[main (root-commit) 1942a18] code: заготовка программы
1 file changed, 9 insertions(+)
create mode 100644 main.cpp
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/alice/project (main)
$ git add project.cbp
warning: in the working copy of 'project.cbp', LF will be replaced by CRLF the next time Git touches it
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/alice/project (main)
$ git commit -m 'build: add project file'
[main 168963a] build: add project file
1 file changed, 40 insertions(+)
create mode 100644 project.cbp
После добавления в программу ввода 2х чисел видим, что файл main.cpp был изменен
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/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/
no changes added to commit (use "git add" and/or "git commit -a")
8. Создание коммитов с изменениями
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/alice/project (main)
$ git add main.cpp
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/alice/project (main)
$ git commit -m 'code: вывод суммы'
[main 5668722] code: вывод суммы
1 file changed, 5 insertions(+), 2 deletions(-)
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/alice/project (main)
$ git add main.cpp
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/alice/project (main)
$ git commit -m 'code: вывод разности'
[main 5731cbc] code: вывод разности
1 file changed, 3 insertions(+), 1 deletion(-)
9. Игнорирование файлов
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/alice/project (main)
$ git status
On branch main
Untracked files:
(use "git add <file>..." to include in what will be committed)
.gitignore
obj/
project.depend
nothing added to commit but untracked files present (use "git add" to track)
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/alice/project (main)
$ git status
On branch main
Untracked files:
(use "git add <file>..." to include in what will be committed)
.gitignore
project.depend
nothing added to commit but untracked files present (use "git add" to track)
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/alice/project (main)
$ git status
On branch main
Untracked files:
(use "git add <file>..." to include in what will be committed)
.gitignore
nothing added to commit but untracked files present (use "git add" to track)
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/alice/project (main)
$ git add .gitignore
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/alice/project (main)
$ git commit -m 'git: игнорирование бинарных файлов'
[main 96aa70d] git: игнорирование бинарных файлов
1 file changed, 4 insertions(+)
create mode 100644 .gitignore
10. ПРОСМОТР ИСТОРИИ
С помощью команды git log и различных ее опций просматриваем журнал коммитов
Используем команду git log –stat
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/alice/project (main)
$ git log --stat
commit 96aa70dbcebbcafc01aeec99a729937bbe654fd1 (HEAD -> main)
Author: Alice (LekomtsevDO) <LekomtsevDO@mpei.ru>
Date: Sun Mar 23 19:40:17 2025 +0300
git: игнорирование бинарных файлов
.gitignore | 4 ++++
1 file changed, 4 insertions(+)
commit 5731cbc0a8d9632dd7b3c7b8134e1f325fdd5f0e
Author: Alice (LekomtsevDO) <LekomtsevDO@mpei.ru>
Date: Sun Mar 23 19:27:16 2025 +0300
code: вывод разности
main.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
commit 5668722f3bdfed5aa25290d9993cc6b8b55b2850
Author: Alice (LekomtsevDO) <LekomtsevDO@mpei.ru>
Date: Sun Mar 23 19:24:41 2025 +0300
code: вывод суммы
main.cpp | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
commit 168963a074c4ce025c3436fbcd222771d5aac386
Author: Alice (LekomtsevDO) <LekomtsevDO@mpei.ru>
Date: Sun Mar 23 19:15:56 2025 +0300
build: add project file
project.cbp | 40 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 40 insertions(+)
commit 1942a187b0ef8761ffe7c74bec698c627c23c9ed
В последнем коммите первой строкой показывается хэш коммита, по которому можно
потом найти этот коммит
Во 2 стр. записан автор, внесший этот коммит, а стр. ниже – время создания коммита
Далее идет комментарий к коммиту
Перечисление файлов, в которых произошли изменения и кол-во измененных строчек(“+” добавленная стр., “-” удаленная стр.)
В последней стр. приведена статистика изменений данных файлов
(Использование других способов просмотра истории)
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/alice/project (main)
$ git log --oneline --decorate
96aa70d (HEAD -> main) git: игнорирование бинарных файлов
5731cbc code: вывод разности
5668722 code: вывод суммы
168963a build: add project file
1942a18 code: заготовка программы
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/alice/project (main)
$ git log --oneline --decorate --all --graph
* 96aa70d (HEAD -> main) git: игнорирование бинарных файлов
* 5731cbc code: вывод разности
* 5668722 code: вывод суммы
* 168963a build: add project file
Коммиты по теме build, затем коммиты, затрагивающие project.cbp.
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/alice/project (main)
$ git log --grep "build:"
commit 168963a074c4ce025c3436fbcd222771d5aac386
Author: Alice (LekomtsevDO) <LekomtsevDO@mpei.ru>
Date: Sun Mar 23 19:15:56 2025 +0300
build: add project file
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/alice/project (main)
$ git log -- project.cbp
commit 168963a074c4ce025c3436fbcd222771d5aac386
Author: Alice (LekomtsevDO) <LekomtsevDO@mpei.ru>
Date: Sun Mar 23 19:15:56 2025 +0300
build: add project file
Просмотр коммитов
три способа
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/alice/project (main)
$ git show HEAD~1
commit 5731cbc0a8d9632dd7b3c7b8134e1f325fdd5f0e
Author: Alice (LekomtsevDO) <LekomtsevDO@mpei.ru>
Date: Sun Mar 23 19:27:16 2025 +0300
code: вывод разности
diff --git a/main.cpp b/main.cpp
index 4458195..fae5b4f 100644
--- a/main.cpp
+++ b/main.cpp
@@ -7,6 +7,8 @@ int main()
cout << "Enter A and B: ";
int a, b;
cin >> a >> b;
- cout << a + b;
+ cout << "A + B = " << a + b << '\n'
+ << "A - B = " << a - b << '\n';
+
}
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/alice/project (main)
$ git show main~1
commit 5731cbc0a8d9632dd7b3c7b8134e1f325fdd5f0e
Author: Alice (LekomtsevDO) <LekomtsevDO@mpei.ru>
Date: Sun Mar 23 19:27:16 2025 +0300
code: вывод разности
diff --git a/main.cpp b/main.cpp
index 4458195..fae5b4f 100644
--- a/main.cpp
+++ b/main.cpp
@@ -7,6 +7,8 @@ int main()
cout << "Enter A and B: ";
int a, b;
cin >> a >> b;
- cout << a + b;
+ cout << "A + B = " << a + b << '\n'
+ << "A - B = " << a - b << '\n';
+
}
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/alice/project (main)
$ git show 5731cbc
commit 5731cbc0a8d9632dd7b3c7b8134e1f325fdd5f0e
Author: Alice (LekomtsevDO) <LekomtsevDO@mpei.ru>
Date: Sun Mar 23 19:27:16 2025 +0300
code: вывод разности
diff --git a/main.cpp b/main.cpp
index 4458195..fae5b4f 100644
--- a/main.cpp
+++ b/main.cpp
@@ -7,6 +7,8 @@ int main()
cout << "Enter A and B: ";
int a, b;
cin >> a >> b;
- cout << a + b;
+ cout << "A + B = " << a + b << '\n'
+ << "A - B = " << a - b << '\n';
+
}
просмотр изменений
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/alice/project (main)
$ git diff
diff --git a/main.cpp b/main.cpp
index fae5b4f..d29348f 100644
--- a/main.cpp
+++ b/main.cpp
@@ -8,7 +8,8 @@ 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';
}
В качестве первой стр. мы видим входные данные команды для сравнения файлов
Далее идет заголовок с легендой изменения, место измененного кода и измененная функция
На след. строке идут строки вокруг измененной части, удаленные и добавленные строки
откат изменений
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/alice/project (main)
$ git commit -m 'code: вывод произведения'
[main 817c585] code: вывод произведения
1 file changed, 2 insertions(+), 1 deletion(-)
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/alice/project (main)
$ git reset --hard HEAD~1
HEAD is now at 96aa70d git: игнорирование бинарных файлов
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/alice/project (main)
$ git checkout HEAD -– main.cpp
НАСТРОЙКА SSH
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/alice/project (main)
$ ssh-keygen
Generating public/private ed25519 key pair.
Enter file in which to save the key (/c/Users/lekom/.ssh/id_ed25519):
Enter passphrase for "/c/Users/lekom/.ssh/id_ed25519" (empty for no passphrase):
Enter same passphrase again:
Your identification has been saved in /c/Users/lekom/.ssh/id_ed25519
Your public key has been saved in /c/Users/lekom/.ssh/id_ed25519.pub
The key fingerprint is:
SHA256:RLkrZaGmsrJYDMzfQyLZTgDEWtFsyj3wd+cLTvcsD3o lekom@P15-I5W300
The key's randomart image is:
+--[ED25519 256]--+
|+..+ .. |
|..o + .o |
|.+ * ..o |
|+ * + +.= . |
|.= + * +S+ |
| o* = . + o |
| o= o + o.+ |
|o.. . ..E.o |
|oo .. o. |
+----[SHA256]-----+
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/alice/project (main)
$ eval $(ssh-agent -s)
Agent pid 1757
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/alice/project (main)
$ ssh-add
Enter passphrase for /c/Users/lekom/.ssh/id_ed25519:
Identity added: /c/Users/lekom/.ssh/id_ed25519 (lekom@P15-I5W300)
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/alice/project (main)
$ cat ~/.ssh/id_ed25519.pub
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ7wDZzrnIxf4lw+3k79Bf14yMp80rMSlfpPBVrm1BP/ lekom@P15-I5W300
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/alice/project (main)
$ git remote add origin git@uit.mpei.ru:LekomtsevDO/cs-lab02.git
lekom@P15-I5W300 MINGW64 ~/Desktop/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: 15, done.
Counting objects: 100% (15/15), done.
Delta compression using up to 12 threads
Compressing objects: 100% (13/13), done.
Writing objects: 100% (15/15), 2.01 KiB | 206.00 KiB/s, done.
Total 15 (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:LekomtsevDO/cs-lab02.git
* [new branch] main -> main
branch 'main' set up to track 'origin/main'.
ПОЛУЧЕНИЕ ПРОЕКТА С СЕРВЕРА боб
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/bob
$ git clone git@uit.mpei.ru:LekomtsevDO/cs-lab02.git project
Cloning into 'project'...
Enter passphrase for key '/c/Users/lekom/.ssh/id_ed25519':
remote: Enumerating objects: 15, done.
remote: Counting objects: 100% (15/15), done.
remote: Compressing objects: 100% (13/13), done.
remote: Total 15 (delta 1), reused 0 (delta 0), pack-reused 0
Receiving objects: 100% (15/15), done.
Resolving deltas: 100% (1/1), done.
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/bob
$ cd project
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/bob/project (main)
$ git config user.name 'Bob (LekomtsevDO)'
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/bob/project (main)
$ git config user.email 'LekomtsevDO@mpei.ru'
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/bob/project (main)
$ git add -u
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/bob/project (main)
$ git commit -m 'code: вывод произведения'
[main 4dbfb62] code: вывод произведения
1 file changed, 2 insertions(+), 1 deletion(-)
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/bob/project (main)
$ git push
Enter passphrase for key '/c/Users/lekom/.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), 419 bytes | 209.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:LekomtsevDO/cs-lab02.git
96aa70d..4dbfb62 main -> main
алиса
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/alice/project (main)
$ git fetch
Enter passphrase for key '/c/Users/lekom/.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), 399 bytes | 11.00 KiB/s, done.
From uit.mpei.ru:LekomtsevDO/cs-lab02
96aa70d..4dbfb62 main -> origin/main
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/alice/project (main)
$ git log --oneline --decorate --all --graph
* 4dbfb62 (origin/main, origin/HEAD) code: вывод произведения
* 96aa70d (HEAD -> main) git: игнорирование бинарных файлов
* 5731cbc code: вывод разности
* 5668722 code: вывод суммы
* 168963a build: add project file
* 1942a18 code: заготовка программы
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/alice/project (main)
$ git pull --ff-only
Enter passphrase for key '/c/Users/lekom/.ssh/id_ed25519':
Updating 96aa70d..4dbfb62
Fast-forward
main.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
самостоятельно ПЕЧАТЬ ДЕЛЕНИЯ
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/alice/project (main)
$ git add main.cpp
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/alice/project (main)
$ git commit -m 'code: вывод деления'
[main 226c420] code: вывод деления
1 file changed, 2 insertions(+), 1 deletion(-)
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/alice/project (main)
$ git push
Enter passphrase for key '/c/Users/lekom/.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), 406 bytes | 203.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:LekomtsevDO/cs-lab02.git
4dbfb62..226c420 main -> main
у боба
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/bob/project (main)
$ git fetch
Enter passphrase for key '/c/Users/lekom/.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), 386 bytes | 2.00 KiB/s, done.
From uit.mpei.ru:LekomtsevDO/cs-lab02
4dbfb62..226c420 main -> origin/main
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/bob/project (main)
$ git pull --ff-only
Enter passphrase for key '/c/Users/lekom/.ssh/id_ed25519':
Updating 4dbfb62..226c420
Fast-forward
main.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
alice
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/alice/project (main)
$ git add main.cpp
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/alice/project (main)
$ git commit -m 'code: вывод максимума'
[main c26d7ae] code: вывод максимума
1 file changed, 2 insertions(+), 1 deletion(-)
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/alice/project (main)
$ git push
Enter passphrase for key '/c/Users/lekom/.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), 417 bytes | 208.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:LekomtsevDO/cs-lab02.git
226c420..c26d7ae main -> main
bob
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/bob/project (main)
$ git add main.cpp
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/bob/project (main)
$ git commit -m 'code: вывод минимума'
[main f7d8cd2] code: вывод минимума
1 file changed, 2 insertions(+), 1 deletion(-)
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/bob/project (main)
$ git push
Enter passphrase for key '/c/Users/lekom/.ssh/id_ed25519':
To uit.mpei.ru:LekomtsevDO/cs-lab02.git
! [rejected] main -> main (fetch first)
error: failed to push some refs to 'uit.mpei.ru:LekomtsevDO/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.
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/bob/project (main|REBASE 1/1)
$ git rebase --continue
Successfully rebased and updated refs/heads/main.
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/bob/project (main)
$ git log --oneline --decorate --all --graph
* 172e0f7 (HEAD -> main) code: вывод минимума
* c26d7ae (origin/main, origin/HEAD) code: вывод максимума
* 226c420 code: вывод деления
* 4dbfb62 code: вывод произведения
* 96aa70d git: игнорирование бинарных файлов
* 5731cbc code: вывод разности
* 5668722 code: вывод суммы
* 168963a build: add project file
* 1942a18 code: заготовка программы
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/bob/project (main)
$ git push
Enter passphrase for key '/c/Users/lekom/.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), 414 bytes | 138.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:LekomtsevDO/cs-lab02.git
c26d7ae..172e0f7 main -> main
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/alice/project (main)
$ git branch double
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/alice/project (main)
$ git checkout double
Switched to branch 'double'
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/alice/project (double)
$ git add main.cpp
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/alice/project (double)
$ git commit -m 'code: изменение типа переменных'
[double bb98520] code: изменение типа переменных
1 file changed, 1 insertion(+), 1 deletion(-)
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/alice/project (double)
$ git checkout main
Switched to branch 'main'
Your branch is up to date with 'origin/main'.
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/alice/project (main)
$ git fetch
Enter passphrase for key '/c/Users/lekom/.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), 394 bytes | 14.00 KiB/s, done.
From uit.mpei.ru:LekomtsevDO/cs-lab02
c26d7ae..172e0f7 main -> origin/main
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/alice/project (main)
$ git log --oneline --decorate --all --graph
* bb98520 (double) code: изменение типа переменных
| * 172e0f7 (origin/main, origin/HEAD) code: вывод минимума
|/
* c26d7ae (HEAD -> main) code: вывод максимума
* 226c420 code: вывод деления
* 4dbfb62 code: вывод произведения
* 96aa70d git: игнорирование бинарных файлов
* 5731cbc code: вывод разности
* 5668722 code: вывод суммы
* 168963a build: add project file
* 1942a18 code: заготовка программы
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/alice/project (main)
$ git merge double
Updating c26d7ae..bb98520
Fast-forward
main.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
lekom@P15-I5W300 MINGW64 ~/Desktop/lab02/alice/project (main)
$ git push
Enter passphrase for key '/c/Users/lekom/.ssh/id_ed25519':
Enumerating objects: 11, done.
Counting objects: 100% (11/11), done.
Delta compression using up to 12 threads
Compressing objects: 100% (7/7), done.
Writing objects: 100% (7/7), 871 bytes | 217.00 KiB/s, done.
Total 7 (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:LekomtsevDO/cs-lab02.git
172e0f7..a277a32 main -> main
Ссылка в новой задаче View Git Blame Копировать постоянную ссылку