Родитель
93c4bc2f21
Сommit
41d665c970
@ -0,0 +1,907 @@
|
||||
Отчет по лабораторной работе № 2 "Система контроля версий Git"
|
||||
|
||||
Выполнил: Овсянников Р. С.
|
||||
Группа: А-01-24
|
||||
Проверил:
|
||||
|
||||
Примечание: работа выполнялась на Windows.
|
||||
|
||||
1. Создал на рабочем столе каталог lab02 и запустил в нем Git Bash, приглашение:
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02
|
||||
$
|
||||
|
||||
|
||||
|
||||
2. Cоздал каталоги Алисы и Боба, изучил команду cd.
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02
|
||||
$ mkdir alice
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02
|
||||
$ mkdir bob
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02
|
||||
$ cd alice
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice
|
||||
$ mkdir project
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice
|
||||
$ cd project
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project
|
||||
$ cd ..
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice
|
||||
$ cd project
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project
|
||||
$
|
||||
|
||||
|
||||
|
||||
|
||||
3. Инициализировал репозитарий.
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project
|
||||
$ git init
|
||||
Initialized empty Git repository in C:/Users/daemo/OneDrive/Рабочий стол/lab02/alice/project/.git/
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master)
|
||||
$
|
||||
|
||||
|
||||
|
||||
|
||||
4. Настроил репозитарий Алисы.
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master)
|
||||
$ git config user.name 'Alice (OvsiannikovRS)'
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master)
|
||||
$ git config user.email 'OvsiannikovRS@mpei.ru'
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master)
|
||||
$
|
||||
|
||||
|
||||
|
||||
|
||||
5. Создал проект в репозитарии Алисы, просмотрел состояние репозитария.
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master)
|
||||
$ git status
|
||||
On branch master
|
||||
|
||||
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)
|
||||
(Ничего не добавленно в коммит но есть неотслеживаемые файлы)
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master)
|
||||
$
|
||||
|
||||
|
||||
|
||||
6. Добавил файл main.cpp в индекс и проверл состояние репозитария.
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master)
|
||||
$ git add main.cpp
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master)
|
||||
$ git status
|
||||
On branch master
|
||||
|
||||
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
|
||||
(гит увидел новый файл main.cpp)
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master)
|
||||
$
|
||||
|
||||
|
||||
|
||||
7. Закоммитил код и переименовал ветку в main.
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master)
|
||||
$ git commit -m 'code: заготовка программы'
|
||||
[master (root-commit) 90e7c97] code: заготовка программы
|
||||
1 file changed, 9 insertions(+)
|
||||
create mode 100644 main.cpp
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master)
|
||||
$ git branch -m main
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main)
|
||||
$
|
||||
|
||||
|
||||
|
||||
8. Добавил файл project.cbp в индекс и сделал комит с ним.
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main)
|
||||
$ git add project.cbp
|
||||
warning: in the working copy of 'project.cbp', LF will be replaced by CRLF the next time Git touches it
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main)
|
||||
$ git commit -m 'build: add project file'
|
||||
[main 5319550] build: add project file
|
||||
1 file changed, 40 insertions(+)
|
||||
create mode 100644 project.cbp
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main)
|
||||
$
|
||||
|
||||
|
||||
|
||||
9. Изменил файл main.cpp, проверил статус репозитария.
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/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 (изменен файл 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")
|
||||
(никакие изменения не добавлены в коммит)
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main)
|
||||
$
|
||||
|
||||
|
||||
|
||||
10. Добавил в вывод разности и суммы чисел А и В, сделал коммит с измененным файлом.
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main)
|
||||
$ add main.cpp
|
||||
bash: add: command not found
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main)
|
||||
$ git add main.cpp
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main)
|
||||
$ git commit -m 'code: add sum A&B'
|
||||
[main 25f963d] code: add sum A&B
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main)
|
||||
$ git commit -a -m 'code: add difference A&B'
|
||||
[main 2fdb42d] code: add difference A&B
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main)
|
||||
$
|
||||
|
||||
|
||||
|
||||
11. Создал файл .gitigniore и сделал с ним коммит.
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/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)
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/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)
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main)
|
||||
$ git add .gitignore
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main)
|
||||
$ git commit -m 'git: add file .gitignore'
|
||||
[main 04e463f] git: add file .gitignore
|
||||
1 file changed, 2 insertions(+)
|
||||
create mode 100644 .gitignore
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main)
|
||||
$
|
||||
|
||||
|
||||
|
||||
12. Попробовал использовать все приведенные команды для просмотра истории изменений проекта.
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main)
|
||||
$ git log --stat
|
||||
commit 04e463ff24c12adbe1e8aa6c252f7ac1eb39cc62 (HEAD -> main) (хеш коммита)
|
||||
Author: Alice (OvsiannikovRS) <OvsiannikovRS@mpei.ru> (автор и эл почта автора коммита)
|
||||
Date: Mon Apr 7 02:40:12 2025 +0300 (дата и время коммита)
|
||||
|
||||
git: add file .gitignore (описание коммита)
|
||||
|
||||
.gitignore | 2 ++
|
||||
1 file changed, 2 insertions(+) (количество измененных файлов)
|
||||
|
||||
commit 2fdb42dffa15d390c57dac57ecee7eb64b160d77
|
||||
Author: Alice (OvsiannikovRS) <OvsiannikovRS@mpei.ru>
|
||||
Date: Mon Apr 7 02:33:01 2025 +0300
|
||||
|
||||
code: add difference A&B
|
||||
|
||||
main.cpp | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
commit 25f963d3e4eaf2c14316ca1d007c8a886c296b44
|
||||
Author: Alice (OvsiannikovRS) <OvsiannikovRS@mpei.ru>
|
||||
Date: Mon Apr 7 02:30:42 2025 +0300
|
||||
|
||||
code: add sum A&B
|
||||
|
||||
main.cpp | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
commit 5319550073578cc85d3fa76162866183740d0b7f
|
||||
Author: Alice (OvsiannikovRS) <OvsiannikovRS@mpei.ru>
|
||||
Date: Mon Apr 7 02:22:34 2025 +0300
|
||||
|
||||
build: add project file
|
||||
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main)
|
||||
$ git log --oneline --decorate
|
||||
04e463f (HEAD -> main) git: add file .gitignore
|
||||
2fdb42d code: add difference A&B
|
||||
25f963d code: add sum A&B
|
||||
5319550 build: add project file
|
||||
90e7c97 code: заготовка программы
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main)
|
||||
$ git log --oneline --decorate --all --graph
|
||||
* 04e463f (HEAD -> main) git: add file .gitignore
|
||||
* 2fdb42d code: add difference A&B
|
||||
* 25f963d code: add sum A&B
|
||||
* 5319550 build: add project file
|
||||
* 90e7c97 code: заготовка программы
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main)
|
||||
$
|
||||
|
||||
|
||||
|
||||
13. Нашел коммиты по теме build, затем затрагивающие файл project.cbp
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main)
|
||||
$ git log --grep 'build'
|
||||
commit 5319550073578cc85d3fa76162866183740d0b7f
|
||||
Author: Alice (OvsiannikovRS) <OvsiannikovRS@mpei.ru>
|
||||
Date: Mon Apr 7 02:22:34 2025 +0300
|
||||
|
||||
build: add project file
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main)
|
||||
$ git log -- project.cbp
|
||||
commit 5319550073578cc85d3fa76162866183740d0b7f
|
||||
Author: Alice (OvsiannikovRS) <OvsiannikovRS@mpei.ru>
|
||||
Date: Mon Apr 7 02:22:34 2025 +0300
|
||||
|
||||
build: add project file
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main)
|
||||
$
|
||||
|
||||
|
||||
|
||||
14. Просмотрел предпоследний коммит.
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main)
|
||||
$ git show HEAD~1
|
||||
commit 2fdb42dffa15d390c57dac57ecee7eb64b160d77
|
||||
Author: Alice (OvsiannikovRS) <OvsiannikovRS@mpei.ru>
|
||||
Date: Mon Apr 7 02:33:01 2025 +0300
|
||||
|
||||
code: add difference A&B
|
||||
|
||||
diff --git a/main.cpp b/main.cpp
|
||||
index 4364dbc..3ec5517 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 = " << a + b << '\n';
|
||||
+ cout << "A + B = " << a + b << '\n'
|
||||
+ << "A - B = " << a - b << '\n';
|
||||
+
|
||||
}
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main)
|
||||
$
|
||||
|
||||
|
||||
|
||||
15. Внес изменения в код, просмотрел изменения в рабочей копии.
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main)
|
||||
$ git diff
|
||||
diff --git a/main.cpp b/main.cpp
|
||||
index 3ec5517..11e84f5 100644
|
||||
--- a/main.cpp
|
||||
+++ b/main.cpp
|
||||
@@ -8,6 +8,7 @@ int main()
|
||||
int a, b;
|
||||
cin >> a >> b;
|
||||
cout << "A + B = " << a + b << '\n'
|
||||
- << "A - B = " << a - b << '\n'; (удаленная строка)
|
||||
+ << "A - B = " << a - b << '\n' (добавоенные строки)
|
||||
+ << "A * B = " << a * b << '\n';
|
||||
|
||||
}
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main)
|
||||
$
|
||||
|
||||
|
||||
|
||||
16. Просмотрел изменения между первым коммитом и коммитом добавляющим вывод разности чисел А и В.
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main)
|
||||
$ git diff 90e7c97 2fdb42d
|
||||
diff --git a/main.cpp b/main.cpp
|
||||
index b4392ec..3ec5517 100644
|
||||
--- a/main.cpp
|
||||
+++ b/main.cpp
|
||||
@@ -4,6 +4,10 @@ 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 @@
|
||||
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
|
||||
+<CodeBlocks_project_file>
|
||||
+ <FileVersion major="1" minor="6" />
|
||||
+ <Project>
|
||||
+ <Option title="project" />
|
||||
+ <Option pch_mode="2" />
|
||||
+ <Option compiler="gcc" />
|
||||
+ <Build>
|
||||
+ <Target title="Debug">
|
||||
+ <Option output="bin/Debug/project" prefix_auto="1" extension_auto="1" />
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main)
|
||||
$
|
||||
|
||||
|
||||
|
||||
17. Закомитил изменения в рабочей копии, добавил комментарий над функцией main, откатил проект к последнему коммиту.
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main)
|
||||
$ git add main.cpp
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main)
|
||||
$ git commit -m 'code: add myltiplying A&B'
|
||||
[main d4d8d4d] code: add myltiplying A&B
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main)
|
||||
$ git checkout HEAD -- main.cpp
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main)
|
||||
$
|
||||
|
||||
|
||||
|
||||
18. Создал пару ключей, задал пароль, запустил агента и загрузил ключ.
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main)
|
||||
$ ssh-keygen
|
||||
Generating public/private ed25519 key pair.
|
||||
Enter file in which to save the key (/c/Users/daemo/.ssh/id_ed25519):
|
||||
Created directory '/c/Users/daemo/.ssh'.
|
||||
Enter passphrase for "/c/Users/daemo/.ssh/id_ed25519" (empty for no passphrase):
|
||||
Enter same passphrase again:
|
||||
Your identification has been saved in /c/Users/daemo/.ssh/id_ed25519
|
||||
Your public key has been saved in /c/Users/daemo/.ssh/id_ed25519.pub
|
||||
The key fingerprint is:
|
||||
SHA256:GMXBL7KVExE0U2qo3S9nT1lqeko8eJ2fStiAaY+IrcM abdxshba)))@abdxshba
|
||||
The key's randomart image is:
|
||||
+--[ED25519 256]--+
|
||||
| +O=. |
|
||||
| o++ |
|
||||
| o o+ |
|
||||
| o.==o. |
|
||||
| . o+So. . |
|
||||
| o.o * = = |
|
||||
| .. o + @ X |
|
||||
| E. * B.. . |
|
||||
| .. ooo.o |
|
||||
+----[SHA256]-----+
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main)
|
||||
$ eval$(ssh-agent -s)
|
||||
bash: evalSSH_AUTH_SOCK=/tmp/ssh-1ITLvYAYGFG0/agent.564;: No such file or directory
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main)
|
||||
$ eval $(ssh-agent -s)
|
||||
Agent pid 572
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main)
|
||||
$ ssh-add
|
||||
Enter passphrase for /c/Users/daemo/.ssh/id_ed25519:
|
||||
Identity added: /c/Users/daemo/.ssh/id_ed25519 (abdxshba)))@abdxshba)
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main)
|
||||
$
|
||||
|
||||
|
||||
|
||||
19. Добавил ключ в список открытых ключей учетной записи на сервере.
|
||||
|
||||
|
||||
|
||||
20. Отправил проект на сервер.
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main)
|
||||
$ git remote add origin git@uit.mpei.ru:OvsiannikovRS/cs-lab02.git
|
||||
|
||||
abdxshba)))@abdxshba 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 16 threads
|
||||
Compressing objects: 100% (18/18), done.
|
||||
Writing objects: 100% (21/21), 2.44 KiB | 625.00 KiB/s, done.
|
||||
Total 21 (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:OvsiannikovRS/cs-lab02.git
|
||||
* [new branch] main -> main
|
||||
branch 'main' set up to track 'origin/main'.
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main)
|
||||
$
|
||||
|
||||
|
||||
|
||||
21. Клонировал проект на машину боба.
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/bob
|
||||
$ git clone git@uit.mpei.ru:OvsiannikovRS/cs-lab02.git project
|
||||
Cloning into 'project'...
|
||||
Enter passphrase for key '/c/Users/daemo/.ssh/id_ed25519':
|
||||
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.
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/bob
|
||||
$ cd project
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/bob/project (main)
|
||||
$
|
||||
|
||||
|
||||
|
||||
22. Настроил git на машине боба.
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/bob/project (main)
|
||||
$ git config user.name 'Bob (OvsiannikovRS)'
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/bob/project (main)
|
||||
$ git config user.email 'OvsiannikovRS@mpei.ru'
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/bob/project (main)
|
||||
$
|
||||
|
||||
|
||||
|
||||
|
||||
23. Изменил код и отправил изменения на сервер от лица боба.
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/bob/project (main)
|
||||
$ git add main.cpp
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/bob/project (main)
|
||||
$ git commit -m 'code: add comment'
|
||||
[main 7104774] code: add comment
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/bob/project (main)
|
||||
$ git push
|
||||
Enter passphrase for key '/c/Users/daemo/.ssh/id_ed25519':
|
||||
Enumerating objects: 5, done.
|
||||
Counting objects: 100% (5/5), done.
|
||||
Delta compression using up to 16 threads
|
||||
Compressing objects: 100% (3/3), done.
|
||||
Writing objects: 100% (3/3), 311 bytes | 311.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 uit.mpei.ru:OvsiannikovRS/cs-lab02.git
|
||||
a84f534..7104774 main -> main
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/bob/project (main)
|
||||
$
|
||||
|
||||
|
||||
|
||||
|
||||
24. Вполнил загрузку изменений на машине алисы, посмотрел историю всех веток.
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main)
|
||||
$ git fetch
|
||||
remote: Enumerating objects: 5, done.
|
||||
remote: Counting objects: 100% (5/5), done.
|
||||
remote: Compressing objects: 100% (3/3), done.
|
||||
remote: Total 3 (delta 2), reused 0 (delta 0), pack-reused 0
|
||||
Unpacking objects: 100% (3/3), 291 bytes | 48.00 KiB/s, done.
|
||||
From uit.mpei.ru:OvsiannikovRS/cs-lab02
|
||||
a84f534..7104774 main -> origin/main
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main)
|
||||
$ git log --oneline --decorate --all --graph
|
||||
* 7104774 (origin/main, origin/HEAD) code: add comment
|
||||
* a84f534 first commit
|
||||
* d4d8d4d code: add myltiplying A&B
|
||||
* 04e463f (HEAD -> main) git: add file .gitignore
|
||||
* 2fdb42d code: add difference A&B
|
||||
* 25f963d code: add sum A&B
|
||||
* 5319550 build: add project file
|
||||
* 90e7c97 code: заготовка программы
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main)
|
||||
$
|
||||
|
||||
|
||||
|
||||
25. Продвинул ветку main к скачанной версии на машине Алисы.
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main)
|
||||
$ git log --oneline --decorate --all --graph
|
||||
* 7104774 (origin/main, origin/HEAD) code: add comment
|
||||
* a84f534 (HEAD -> main) first commit
|
||||
* d4d8d4d code: add myltiplying A&B
|
||||
* 04e463f git: add file .gitignore
|
||||
* 2fdb42d code: add difference A&B
|
||||
* 25f963d code: add sum A&B
|
||||
* 5319550 build: add project file
|
||||
* 90e7c97 code: заготовка программы
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main)
|
||||
$ git pull --ff-only
|
||||
Updating a84f534..7104774
|
||||
Fast-forward
|
||||
main.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main)
|
||||
$
|
||||
|
||||
|
||||
|
||||
26. Добавил в код деление c машины боба, загрузил на сервер, скачал на машину алисы, продвинул ветку main к скачанной версии на машине Алисы.
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/bob/project (main)
|
||||
$ git add main.cpp
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/bob/project (main)
|
||||
$ git commit -m 'code: add division'
|
||||
[main 014c86d] code: add division
|
||||
1 file changed, 4 insertions(+), 3 deletions(-)
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/bob/project (main)
|
||||
$ git push
|
||||
Enter passphrase for key '/c/Users/daemo/.ssh/id_ed25519':
|
||||
Enumerating objects: 5, done.
|
||||
Counting objects: 100% (5/5), done.
|
||||
Delta compression using up to 16 threads
|
||||
Compressing objects: 100% (3/3), done.
|
||||
Writing objects: 100% (3/3), 336 bytes | 336.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 uit.mpei.ru:OvsiannikovRS/cs-lab02.git
|
||||
7104774..014c86d main -> main
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/bob/project (main)
|
||||
$
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main)
|
||||
$ git fetch
|
||||
remote: Enumerating objects: 5, done.
|
||||
remote: Counting objects: 100% (5/5), done.
|
||||
remote: Compressing objects: 100% (3/3), done.
|
||||
remote: Total 3 (delta 2), reused 0 (delta 0), pack-reused 0
|
||||
Unpacking objects: 100% (3/3), 316 bytes | 35.00 KiB/s, done.
|
||||
From uit.mpei.ru:OvsiannikovRS/cs-lab02
|
||||
7104774..014c86d main -> origin/main
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main)
|
||||
$ git pull --ff-only
|
||||
Updating 7104774..014c86d
|
||||
Fast-forward
|
||||
main.cpp | 7 ++++---
|
||||
1 file changed, 4 insertions(+), 3 deletions(-)
|
||||
|
||||
|
||||
|
||||
27. Добавил вывод максимума в коде алисы, сделал коммит и отправил на серверю.
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main)
|
||||
$ git add main.cpp
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main)
|
||||
$ git commit -m 'code: add max'
|
||||
[main 8bb0b62] code: add max
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main)
|
||||
$ git push
|
||||
Enumerating objects: 5, done.
|
||||
Counting objects: 100% (5/5), done.
|
||||
Delta compression using up to 16 threads
|
||||
Compressing objects: 100% (3/3), done.
|
||||
Writing objects: 100% (3/3), 341 bytes | 341.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 uit.mpei.ru:OvsiannikovRS/cs-lab02.git
|
||||
014c86d..8bb0b62 main -> main
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main)
|
||||
$
|
||||
|
||||
|
||||
|
||||
28. Добавил вывод минимума в коде боба, сделал коммит и попытался отправить на серверю.
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/bob/project (main)
|
||||
$ git add main.cpp
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/bob/project (main)
|
||||
$ git commit -m 'code:add min'
|
||||
[main 1e2c0fc] code:add min
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/bob/project (main)
|
||||
$ git push
|
||||
Enter passphrase for key '/c/Users/daemo/.ssh/id_ed25519':
|
||||
To uit.mpei.ru:OvsiannikovRS/cs-lab02.git
|
||||
! [rejected] main -> main (fetch first)
|
||||
error: failed to push some refs to 'uit.mpei.ru:OvsiannikovRS/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.
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/bob/project (main)
|
||||
$
|
||||
|
||||
|
||||
29. Загрузил коммиты из удаленного хранилища и отобразил историю всех веток.
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/bob/project (main)
|
||||
$ git fetch
|
||||
Enter passphrase for key '/c/Users/daemo/.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 2), reused 0 (delta 0), pack-reused 0
|
||||
Unpacking objects: 100% (3/3), 321 bytes | 35.00 KiB/s, done.
|
||||
From uit.mpei.ru:OvsiannikovRS/cs-lab02
|
||||
014c86d..8bb0b62 main -> origin/main
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/bob/project (main)
|
||||
$ git log --oneline --decorate --all --graph
|
||||
* 1e2c0fc (HEAD -> main) code:add min
|
||||
| * 8bb0b62 (origin/main, origin/HEAD) code: add max
|
||||
|/
|
||||
* 014c86d code: add division
|
||||
* 7104774 code: add comment
|
||||
* a84f534 first commit
|
||||
* d4d8d4d code: add myltiplying A&B
|
||||
* 04e463f git: add file .gitignore
|
||||
* 2fdb42d code: add difference A&B
|
||||
* 25f963d code: add sum A&B
|
||||
* 5319550 build: add project file
|
||||
* 90e7c97 code: заготовка программы
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/bob/project (main)
|
||||
$
|
||||
|
||||
|
||||
|
||||
30. Просмотрел состояние хранилища на машине боба.
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/bob/project (main|REBASE 1/1)
|
||||
$ git status
|
||||
interactive rebase in progress; onto 8bb0b62
|
||||
Last command done (1 command done):
|
||||
pick 1e2c0fc code:add min
|
||||
No commands remaining.
|
||||
You are currently rebasing branch 'main' on '8bb0b62'.
|
||||
(fix conflicts and then run "git rebase --continue")
|
||||
(use "git rebase --skip" to skip this patch)
|
||||
(use "git rebase --abort" to check out the original branch)
|
||||
|
||||
Unmerged paths:
|
||||
(use "git restore --staged <file>..." to unstage)
|
||||
(use "git add <file>..." to mark resolution)
|
||||
both modified: main.cpp
|
||||
|
||||
Untracked files:
|
||||
(use "git add <file>..." to include in what will be committed)
|
||||
project.depend
|
||||
|
||||
no changes added to commit (use "git add" and/or "git commit -a")
|
||||
|
||||
|
||||
|
||||
31. Отредактировал код боба, добавил main/cpp в индекс и продолжил операцию rebase.
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/bob/project (main|REBASE 1/1)
|
||||
$ git add main.cpp
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/bob/project (main|REBASE 1/1)
|
||||
$ git rebase --continue
|
||||
Successfully rebased and updated refs/heads/main.
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/bob/project (main)
|
||||
$
|
||||
|
||||
|
||||
|
||||
32. Проверил историю хранилища, отправил изменения на сервер.
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/bob/project (main)
|
||||
$ git log --oneline --decorate --all --graph
|
||||
* d837927 (HEAD -> main) code:add min
|
||||
* 8bb0b62 (origin/main, origin/HEAD) code: add max
|
||||
* 014c86d code: add division
|
||||
* 7104774 code: add comment
|
||||
* a84f534 first commit
|
||||
* d4d8d4d code: add myltiplying A&B
|
||||
* 04e463f git: add file .gitignore
|
||||
* 2fdb42d code: add difference A&B
|
||||
* 25f963d code: add sum A&B
|
||||
* 5319550 build: add project file
|
||||
* 90e7c97 code: заготовка программы
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/bob/project (main)
|
||||
$ git push
|
||||
Enter passphrase for key '/c/Users/daemo/.ssh/id_ed25519':
|
||||
Enumerating objects: 5, done.
|
||||
Counting objects: 100% (5/5), done.
|
||||
Delta compression using up to 16 threads
|
||||
Compressing objects: 100% (3/3), done.
|
||||
Writing objects: 100% (3/3), 363 bytes | 363.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 uit.mpei.ru:OvsiannikovRS/cs-lab02.git
|
||||
8bb0b62..d837927 main -> main
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/bob/project (main)
|
||||
$ git log --oneline --decorate --all --graph
|
||||
* d837927 (HEAD -> main, origin/main, origin/HEAD) code:add min
|
||||
* 8bb0b62 code: add max
|
||||
* 014c86d code: add division
|
||||
* 7104774 code: add comment
|
||||
* a84f534 first commit
|
||||
* d4d8d4d code: add myltiplying A&B
|
||||
* 04e463f git: add file .gitignore
|
||||
* 2fdb42d code: add difference A&B
|
||||
* 25f963d code: add sum A&B
|
||||
* 5319550 build: add project file
|
||||
* 90e7c97 code: заготовка программы
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/bob/project (main)
|
||||
$
|
||||
|
||||
|
||||
|
||||
33. Создал ветку double и перешел в нее.
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main)
|
||||
$ git branch double
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main)
|
||||
$ git checkout double
|
||||
M project.cbp
|
||||
Switched to branch 'double'
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (double)
|
||||
$
|
||||
|
||||
|
||||
|
||||
34. Синхронизировал ветку main на машине Алисы с сервером. Просмотрел историю всех веток.
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (double)
|
||||
$ git checkout main
|
||||
M project.cbp
|
||||
Switched to branch 'main'
|
||||
Your branch is behind 'origin/main' by 1 commit, and can be fast-forwarded.
|
||||
(use "git pull" to update your local branch)
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main)
|
||||
$ git fetch
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main)
|
||||
$ git pull --ff-only
|
||||
Updating 8bb0b62..d837927
|
||||
Fast-forward
|
||||
main.cpp | 8 ++++++--
|
||||
1 file changed, 6 insertions(+), 2 deletions(-)
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main)
|
||||
$ git log --oneline --decorate --all --graph
|
||||
* 93c4bc2 (HEAD -> main, origin/main, origin/HEAD) сборка всего
|
||||
|\
|
||||
| * e7ee40f (double) code: from int to double
|
||||
* | d837927 code:add min
|
||||
|/
|
||||
* 8bb0b62 code: add max
|
||||
* 014c86d code: add division
|
||||
* 7104774 code: add comment
|
||||
* a84f534 first commit
|
||||
* d4d8d4d code: add myltiplying A&B
|
||||
* 04e463f git: add file .gitignore
|
||||
* 2fdb42d code: add difference A&B
|
||||
* 25f963d code: add sum A&B
|
||||
* 5319550 build: add project file
|
||||
* 90e7c97 code: заготовка программы
|
||||
|
||||
abdxshba)))@abdxshba MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (main)
|
||||
$
|
||||
|
||||
|
||||
|
||||
|
||||
Загрузка…
Ссылка в новой задаче