Родитель
edf19e8ab1
Сommit
ca39e82095
@ -0,0 +1,483 @@
|
||||
Пётр@DESKTOP-O5JLQQ0 MINGW64 ~/Desktop/lab02 (master)
|
||||
$ mkdir alice
|
||||
|
||||
Пётр@DESKTOP-O5JLQQ0 MINGW64 ~/Desktop/lab02 (master)
|
||||
$ mkdir bob
|
||||
|
||||
Пётр@DESKTOP-O5JLQQ0 MINGW64 ~/Desktop/lab02 (master)
|
||||
$ cd alice
|
||||
|
||||
Пётр@DESKTOP-O5JLQQ0 MINGW64 ~/Desktop/lab02/alice (master)
|
||||
$ mkdir project
|
||||
|
||||
Пётр@DESKTOP-O5JLQQ0 MINGW64 ~/Desktop/lab02/alice (master)
|
||||
$ cd project
|
||||
|
||||
Пётр@DESKTOP-O5JLQQ0 MINGW64 ~/Desktop/lab02/alice/project (master)
|
||||
$ cd ..
|
||||
|
||||
Пётр@DESKTOP-O5JLQQ0 MINGW64 ~/Desktop/lab02/alice (master)
|
||||
$ cd project
|
||||
|
||||
Пётр@DESKTOP-O5JLQQ0 MINGW64 ~/Desktop/lab02/alice/project (master)
|
||||
$ git init
|
||||
Initialized empty Git repository in C:/Users/Пётр/Desktop/lab02/alice/project/.git/
|
||||
|
||||
Пётр@DESKTOP-O5JLQQ0 MINGW64 ~/Desktop/lab02/alice/project (master)
|
||||
$ git branch -m main
|
||||
|
||||
Пётр@DESKTOP-O5JLQQ0 MINGW64 ~/Desktop/lab02/alice/project (main)
|
||||
$ git config user.name 'Alice (NalitkinPK)'
|
||||
|
||||
Пётр@DESKTOP-O5JLQQ0 MINGW64 ~/Desktop/lab02/alice/project (main)
|
||||
$ git config user.email 'NalitkinPK@mpei.ru'
|
||||
|
||||
Пётр@DESKTOP-O5JLQQ0 MINGW64 ~/Desktop/lab02/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
|
||||
|
||||
nothing added to commit but untracked files present (use "git add" to track)
|
||||
|
||||
Пётр@DESKTOP-O5JLQQ0 MINGW64 ~/Desktop/lab02/alice/project (main)
|
||||
$ git add main.cpp
|
||||
|
||||
Пётр@DESKTOP-O5JLQQ0 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
|
||||
|
||||
|
||||
Пётр@DESKTOP-O5JLQQ0 MINGW64 ~/Desktop/lab02/alice/project (main)
|
||||
$ git commit -m 'code:заготовка программы'
|
||||
[main (root-commit) 0bd3126] code:заготовка программы
|
||||
1 file changed, 9 insertions(+)
|
||||
create mode 100644 main.cpp
|
||||
|
||||
Пётр@DESKTOP-O5JLQQ0 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 n
|
||||
|
||||
Пётр@DESKTOP-O5JLQQ0 MINGW64 ~/Desktop/lab02/alice/project (main)
|
||||
$ git commit -m 'build: добавлен файл проекта'
|
||||
[main 20eb3d9] build: добавлен файл проекта
|
||||
1 file changed, 40 insertions(+)
|
||||
create mode 100644 project.cbp
|
||||
|
||||
Пётр@DESKTOP-O5JLQQ0 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")
|
||||
|
||||
Пётр@DESKTOP-O5JLQQ0 MINGW64 ~/Desktop/lab02/alice/project (main)
|
||||
$ git add main.cpp
|
||||
|
||||
Пётр@DESKTOP-O5JLQQ0 MINGW64 ~/Desktop/lab02/alice/project (main)
|
||||
$ git commit -m 'code: добавлен ввод А и В'
|
||||
[main 47cf521] code: добавлен ввод А и В
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
Пётр@DESKTOP-O5JLQQ0 MINGW64 ~/Desktop/lab02/alice/project (main)
|
||||
$ git add -u
|
||||
|
||||
Пётр@DESKTOP-O5JLQQ0 MINGW64 ~/Desktop/lab02/alice/project (main)
|
||||
$ git commit -m'code: вывод суммы А и В'
|
||||
[main 06839b3] code: вывод суммы А и В
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
Пётр@DESKTOP-O5JLQQ0 MINGW64 ~/Desktop/lab02/alice/project (main)
|
||||
$ git commit -a -m "Добавлена разность А и В"
|
||||
[main a443df0] Добавлена разность А и В
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
Пётр@DESKTOP-O5JLQQ0 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/
|
||||
|
||||
nothing added to commit but untracked files present (use "git add" to track)
|
||||
|
||||
Пётр@DESKTOP-O5JLQQ0 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)
|
||||
|
||||
Пётр@DESKTOP-O5JLQQ0 MINGW64 ~/Desktop/lab02/alice/project (main)
|
||||
$ git add .gitignore
|
||||
|
||||
Пётр@DESKTOP-O5JLQQ0 MINGW64 ~/Desktop/lab02/alice/project (main)
|
||||
$ git commit -m 'git:Добавлен файл gitignore'
|
||||
[main 9f69d05] git:Добавлен файл gitignore
|
||||
1 file changed, 3 insertions(+)
|
||||
create mode 100644 .gitignore
|
||||
|
||||
|
||||
Пётр@DESKTOP-O5JLQQ0 MINGW64 ~/Desktop/lab02/alice/project (main)
|
||||
$ git status
|
||||
On branch main
|
||||
Changes to be committed:
|
||||
(use "git restore --staged <file>..." to unstage)
|
||||
new file: .gitignore
|
||||
|
||||
Пётр@DESKTOP-O5JLQQ0 MINGW64 ~/Desktop/lab02/alice/project (main)
|
||||
$ git log
|
||||
commit 9f69d05cd2d07e4e1b6b1719b88404c7a83d2e66 (HEAD -> main)
|
||||
Author: Alice (NalitkinPK) <NalitkinPK@mpei.ru>
|
||||
Date: Sat Nov 9 13:58:51 2024 +0300
|
||||
|
||||
git:Добавлен файл gitignore
|
||||
|
||||
commit a443df0ddbf6393f02dd0a678f8e50a12142a579
|
||||
Author: Alice (NalitkinPK) <NalitkinPK@mpei.ru>
|
||||
Date: Sat Nov 9 13:39:21 2024 +0300
|
||||
|
||||
Добавлена разность А и В
|
||||
|
||||
commit 06839b34cce54f530dced2b9b826260cd032162c
|
||||
Author: Alice (NalitkinPK) <NalitkinPK@mpei.ru>
|
||||
Date: Sat Nov 9 13:35:27 2024 +0300
|
||||
|
||||
code: вывод суммы А и В
|
||||
|
||||
commit 47cf521e25c0e4690ca07885a065e4d1015769c2
|
||||
Author: Alice (NalitkinPK) <NalitkinPK@mpei.ru>
|
||||
Date: Sat Nov 9 13:31:32 2024 +0300
|
||||
|
||||
code: добавлен ввод А и В
|
||||
|
||||
commit 20eb3d9c40e67a589508a65ef307b964cf41624f
|
||||
Author: Alice (NalitkinPK) <NalitkinPK@mpei.ru>
|
||||
Date: Sat Nov 9 13:25:39 2024 +0300
|
||||
|
||||
build: добавлен файл проекта
|
||||
|
||||
commit 0bd3126304175cabdb2ddf61f069b1c9707efb06
|
||||
Author: Alice (NalitkinPK) <NalitkinPK@mpei.ru>
|
||||
Date: Sat Nov 9 13:23:08 2024 +0300
|
||||
|
||||
code:заготовка программы
|
||||
|
||||
Пётр@DESKTOP-O5JLQQ0 MINGW64 ~/Desktop/lab02/alice/project (main)
|
||||
$ git log --stat
|
||||
commit 9f69d05cd2d07e4e1b6b1719b88404c7a83d2e66 (HEAD -> main)
|
||||
Author: Alice (NalitkinPK) <NalitkinPK@mpei.ru>
|
||||
Date: Sat Nov 9 13:58:51 2024 +0300
|
||||
|
||||
git:Добавлен файл gitignore
|
||||
|
||||
.gitignore | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
commit a443df0ddbf6393f02dd0a678f8e50a12142a579
|
||||
Author: Alice (NalitkinPK) <NalitkinPK@mpei.ru>
|
||||
Date: Sat Nov 9 13:39:21 2024 +0300
|
||||
|
||||
Добавлена разность А и В
|
||||
|
||||
main.cpp | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
commit 06839b34cce54f530dced2b9b826260cd032162c
|
||||
Author: Alice (NalitkinPK) <NalitkinPK@mpei.ru>
|
||||
Date: Sat Nov 9 13:35:27 2024 +0300
|
||||
|
||||
code: вывод суммы А и В
|
||||
|
||||
main.cpp | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
commit 47cf521e25c0e4690ca07885a065e4d1015769c2
|
||||
Author: Alice (NalitkinPK) <NalitkinPK@mpei.ru>
|
||||
Date: Sat Nov 9 13:31:32 2024 +0300
|
||||
|
||||
code: добавлен ввод А и В
|
||||
|
||||
main.cpp | 5 +++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
commit 20eb3d9c40e67a589508a65ef307b964cf41624f
|
||||
Author: Alice (NalitkinPK) <NalitkinPK@mpei.ru>
|
||||
Date: Sat Nov 9 13:25:39 2024 +0300
|
||||
|
||||
build: добавлен файл проекта
|
||||
|
||||
project.cbp | 40 ++++++++++++++++++++++++++++++++++++++++
|
||||
1 file changed, 40 insertions(+)
|
||||
|
||||
commit 0bd3126304175cabdb2ddf61f069b1c9707efb06
|
||||
Author: Alice (NalitkinPK) <NalitkinPK@mpei.ru>
|
||||
Date: Sat Nov 9 13:23:08 2024 +0300
|
||||
|
||||
code:заготовка программы
|
||||
|
||||
main.cpp | 9 +++++++++
|
||||
1 file changed, 9 insertions(+)
|
||||
|
||||
Пётр@DESKTOP-O5JLQQ0 MINGW64 ~/Desktop/lab02/alice/project (main)
|
||||
$ git log --oneline --decorate
|
||||
9f69d05 (HEAD -> main) git:Добавлен файл gitignore
|
||||
a443df0 Добавлена разность А и В
|
||||
06839b3 code: вывод суммы А и В
|
||||
47cf521 code: добавлен ввод А и В
|
||||
20eb3d9 build: добавлен файл проекта
|
||||
0bd3126 code:заготовка программы
|
||||
|
||||
Пётр@DESKTOP-O5JLQQ0 MINGW64 ~/Desktop/lab02/alice/project (main)
|
||||
$ git log --oneline --decorate --all --graph
|
||||
* 9f69d05 (HEAD -> main) git:Добавлен файл gitignore
|
||||
* a443df0 Добавлена разность А и В
|
||||
* 06839b3 code: вывод суммы А и В
|
||||
* 47cf521 code: добавлен ввод А и В
|
||||
* 20eb3d9 build: добавлен файл проекта
|
||||
* 0bd3126 code:заготовка программы
|
||||
|
||||
Пётр@DESKTOP-O5JLQQ0 MINGW64 ~/Desktop/lab02/alice/project (main)
|
||||
$ git log --grep 'code'
|
||||
commit 06839b34cce54f530dced2b9b826260cd032162c
|
||||
Author: Alice (NalitkinPK) <NalitkinPK@mpei.ru>
|
||||
Date: Sat Nov 9 13:35:27 2024 +0300
|
||||
|
||||
code: вывод суммы А и В
|
||||
|
||||
commit 47cf521e25c0e4690ca07885a065e4d1015769c2
|
||||
Author: Alice (NalitkinPK) <NalitkinPK@mpei.ru>
|
||||
Date: Sat Nov 9 13:31:32 2024 +0300
|
||||
|
||||
code: добавлен ввод А и В
|
||||
|
||||
commit 0bd3126304175cabdb2ddf61f069b1c9707efb06
|
||||
Author: Alice (NalitkinPK) <NalitkinPK@mpei.ru>
|
||||
Date: Sat Nov 9 13:23:08 2024 +0300
|
||||
|
||||
code:заготовка программы
|
||||
|
||||
Пётр@DESKTOP-O5JLQQ0 MINGW64 ~/Desktop/lab02/alice/project (main)
|
||||
$ git log --grep 'build'
|
||||
commit 20eb3d9c40e67a589508a65ef307b964cf41624f
|
||||
Author: Alice (NalitkinPK) <NalitkinPK@mpei.ru>
|
||||
Date: Sat Nov 9 13:25:39 2024 +0300
|
||||
|
||||
build: добавлен файл проекта
|
||||
|
||||
Пётр@DESKTOP-O5JLQQ0 MINGW64 ~/Desktop/lab02/alice/project (main)
|
||||
$ git log -- project.cbp
|
||||
commit 20eb3d9c40e67a589508a65ef307b964cf41624f
|
||||
Author: Alice (NalitkinPK) <NalitkinPK@mpei.ru>
|
||||
Date: Sat Nov 9 13:25:39 2024 +0300
|
||||
|
||||
build: добавлен файл проекта
|
||||
|
||||
Пётр@DESKTOP-O5JLQQ0 MINGW64 ~/Desktop/lab02/alice/project (main)
|
||||
$ git show HEAD~1
|
||||
commit a443df0ddbf6393f02dd0a678f8e50a12142a579
|
||||
Author: Alice (NalitkinPK) <NalitkinPK@mpei.ru>
|
||||
Date: Sat Nov 9 13:39:21 2024 +0300
|
||||
|
||||
Добавлена разность А и В
|
||||
|
||||
diff --git a/main.cpp b/main.cpp
|
||||
index 3b24022..fd7ecc9 100644
|
||||
--- a/main.cpp
|
||||
+++ b/main.cpp
|
||||
@@ -8,5 +8,6 @@ int main()
|
||||
int a, b;
|
||||
cin >> a >> b;
|
||||
|
||||
- cout << a+b;
|
||||
+ cout << "A + B = " << a + b << '\n'
|
||||
+ << "A - B = " << a - b << '\n';
|
||||
}
|
||||
|
||||
Пётр@DESKTOP-O5JLQQ0 MINGW64 ~/Desktop/lab02/alice/project (main)
|
||||
$ git show main~1
|
||||
commit a443df0ddbf6393f02dd0a678f8e50a12142a579
|
||||
Author: Alice (NalitkinPK) <NalitkinPK@mpei.ru>
|
||||
Date: Sat Nov 9 13:39:21 2024 +0300
|
||||
|
||||
Добавлена разность А и В
|
||||
|
||||
diff --git a/main.cpp b/main.cpp
|
||||
index 3b24022..fd7ecc9 100644
|
||||
--- a/main.cpp
|
||||
+++ b/main.cpp
|
||||
@@ -8,5 +8,6 @@ int main()
|
||||
int a, b;
|
||||
cin >> a >> b;
|
||||
|
||||
- cout << a+b;
|
||||
+ cout << "A + B = " << a + b << '\n'
|
||||
+ << "A - B = " << a - b << '\n';
|
||||
}
|
||||
|
||||
Пётр@DESKTOP-O5JLQQ0 MINGW64 ~/Desktop/lab02/alice/project (main)
|
||||
$ git show a443df0ddbf6393f02dd0a678f8e50a12142a579
|
||||
commit a443df0ddbf6393f02dd0a678f8e50a12142a579
|
||||
Author: Alice (NalitkinPK) <NalitkinPK@mpei.ru>
|
||||
Date: Sat Nov 9 13:39:21 2024 +0300
|
||||
|
||||
Добавлена разность А и В
|
||||
|
||||
diff --git a/main.cpp b/main.cpp
|
||||
index 3b24022..fd7ecc9 100644
|
||||
--- a/main.cpp
|
||||
+++ b/main.cpp
|
||||
@@ -8,5 +8,6 @@ int main()
|
||||
int a, b;
|
||||
cin >> a >> b;
|
||||
|
||||
- cout << a+b;
|
||||
+ cout << "A + B = " << a + b << '\n'
|
||||
+ << "A - B = " << a - b << '\n';
|
||||
}
|
||||
|
||||
Пётр@DESKTOP-O5JLQQ0 MINGW64 ~/Desktop/lab02/alice/project (main)
|
||||
$ git diff
|
||||
diff --git a/main.cpp b/main.cpp
|
||||
index fd7ecc9..d6857c5 100644
|
||||
--- a/main.cpp
|
||||
+++ b/main.cpp
|
||||
@@ -9,5 +9,6 @@ int main()
|
||||
cin >> a >> b;
|
||||
|
||||
cout << "A + B = " << a + b << '\n'
|
||||
- << "A - B = " << a - b << '\n';---------изменена строчка
|
||||
+ << "A - B = " << a - b << '\n'
|
||||
+ << "A * B = " << a * b << '\n';---------добавлено
|
||||
}
|
||||
|
||||
Пётр@DESKTOP-O5JLQQ0 MINGW64 ~/Desktop/lab02/alice/project (main)
|
||||
$ git diff HEAD~1 HEAD~5
|
||||
diff --git a/main.cpp b/main.cpp
|
||||
index fd7ecc9..b4392ec 100644
|
||||
--- a/main.cpp
|
||||
+++ b/main.cpp
|
||||
@@ -4,10 +4,6 @@ using namespace std;
|
||||
|
||||
int main()
|
||||
{
|
||||
- cout << "Enter A and B: ";
|
||||
- int a, b;
|
||||
- cin >> a >> b;
|
||||
-
|
||||
- cout << "A + B = " << a + b << '\n'
|
||||
- << "A - B = " << a - b << '\n';
|
||||
+ cout << "Hello world!" << endl;
|
||||
+ return 0;
|
||||
}
|
||||
diff --git a/project.cbp b/project.cbp
|
||||
deleted file mode 100644
|
||||
index 99bb702..0000000
|
||||
--- a/project.cbp
|
||||
+++ /dev/null
|
||||
@@ -1,40 +0,0 @@
|
||||
-<?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" />
|
||||
- <Option object_output="obj/Debug/" />
|
||||
- <Option type="1" />
|
||||
- <Option compiler="gcc" />
|
||||
- <Compiler>
|
||||
- <Add option="-g" />
|
||||
- </Compiler>
|
||||
- </Target>
|
||||
- <Target title="Release">
|
||||
- <Option output="bin/Release/project" prefix_auto="1" extension_auto="1" />
|
||||
- <Option object_output="obj/Release/" />
|
||||
- <Option type="1" />
|
||||
- <Option compiler="gcc" />
|
||||
- <Compiler>
|
||||
- <Add option="-O2" />
|
||||
- </Compiler>
|
||||
- <Linker>
|
||||
- <Add option="-s" />
|
||||
- </Linker>
|
||||
- </Target>
|
||||
- </Build>
|
||||
- <Compiler>
|
||||
- <Add option="-Wall" />
|
||||
- <Add option="-fexceptions" />
|
||||
- </Compiler>
|
||||
- <Unit filename="main.cpp" />
|
||||
- <Extensions>
|
||||
- <lib_finder disable_auto="1" />
|
||||
- </Extensions>
|
||||
- </Project>
|
||||
-</CodeBlocks_project_file>
|
||||
|
||||
Пётр@DESKTOP-O5JLQQ0 MINGW64 ~/Desktop/lab02/bob/project (main)
|
||||
$ git log --oneline --decorate --all --graph
|
||||
* df5cc75 (HEAD -> main) code: Добавление печати минимума
|
||||
* 36f516a code: Добавление печати минимума
|
||||
| * 3553b60 (origin/main, origin/HEAD) code: Добавление печати максимума
|
||||
|/
|
||||
* 0d5de81 code: Добавление частного
|
||||
* 851e22f code:Добавление произведения А и В
|
||||
* 9f69d05 git:Добавлен файл gitignore
|
||||
* a443df0 Добавлена разность А и В
|
||||
* 06839b3 code: вывод суммы А и В
|
||||
* 47cf521 code: добавлен ввод А и В
|
||||
* 20eb3d9 build: добавлен файл проекта
|
||||
* 0bd3126 code:заготовка программы
|
||||
|
||||
Пётр@DESKTOP-O5JLQQ0 MINGW64 ~/Desktop/lab02/alice/project (main)
|
||||
$ git log --oneline --decorate --all --graph
|
||||
* edf19e8 (HEAD -> main, origin/main) Merge branch 'double'
|
||||
|\
|
||||
| * 68ec2c3 (double) code: Изменение типа переменных на double
|
||||
* | f207921 code: Изменение типа переменных на double
|
||||
* | 1be44e2 revert d19ff575719766b768cf63cf2ca14fcd2c27961a
|
||||
* | d19ff57 code: Добавление печати минимума
|
||||
* | 342543c code: Добавление печати минимума
|
||||
|/
|
||||
* 3553b60 code: Добавление печати максимума
|
||||
* 0d5de81 code: Добавление частного
|
||||
* 851e22f code:Добавление произведения А и В
|
||||
* 9f69d05 git:Добавлен файл gitignore
|
||||
* a443df0 Добавлена разность А и В
|
||||
* 06839b3 code: вывод суммы А и В
|
||||
* 47cf521 code: добавлен ввод А и В
|
||||
* 20eb3d9 build: добавлен файл проекта
|
||||
* 0bd3126 code:заготовка программы
|
||||
Загрузка…
Ссылка в новой задаче