diff --git a/отчет.txt b/отчет.txt index 58c37be..8b13789 100644 --- a/отчет.txt +++ b/отчет.txt @@ -1,457 +1 @@ -user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02 -$ mkdir alice - -user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02 -$ mkdir bob - -user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02 -$ cd alice - -user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice -$ mkdir project - -user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice -$ cd project - -user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project -$ cd .. - -user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice -$ cd project - -user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project -$ git init -Initialized empty Git repository in C:/Users/user/Desktop/lab02/alice/project/.git/ -user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (master) -$ ls -A -.git/ - -user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (master) -$ git config user.name 'Alice (PakhomovaAY)' - -user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (master) -$ git config user.email 'PakhomovaAY@mpei.ru' - -user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (master) -$ git status -On branch master - -No commits yet - -Untracked files: - (use "git add ..." to include in what will be committed) - main.cpp - project.cbp - -nothing added to commit but untracked files present (use "git add" to track) - -user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (master) -$ git status -On branch master - -No commits yet - -Untracked files: - (use "git add ..." to include in what will be committed) - bin/ - main.cpp - obj/ - project.cbp - project.layout - -nothing added to commit but untracked files present (use "git add" to track) - -user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (master) -$ ls -a -./ ../ .git/ bin/ main.cpp obj/ project.cbp project.layout - -user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (master) -$ git status -On branch master - -No commits yet - -Untracked files: - (use "git add ..." to include in what will be committed) - bin/ - main.cpp - obj/ - project.cbp - -nothing added to commit but untracked files present (use "git add" to track) - -user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (master) -$ git add main.cpp - -user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (master) -$ git status -On branch master - -No commits yet - -Changes to be committed: - (use "git rm --cached ..." to unstage) - new file: main.cpp - -Untracked files: - (use "git add ..." to include in what will be committed) - bin/ - obj/ - project.cbp - - -user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (master) -$ git commit -m 'code: заготовка программы' -[master (root-commit) e465eca] code: заготовка программы - 1 file changed, 9 insertions(+) - create mode 100644 main.cpp - -user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (master) -$ git status -On branch master -Untracked files: - (use "git add ..." to include in what will be committed) - bin/ - obj/ - project.cbp - -nothing added to commit but untracked files present (use "git add" to track) - -user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (master) -$ git add project.cbp -warning: in the working copy of 'project.cbp', LF will be replaced by CRLF the next time Git touches it - -user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (master) -$ git commit -m 'build: добавлен файл проекта' -[master b7b5f76] build: добавлен файл проекта - 1 file changed, 40 insertions(+) - create mode 100644 project.cbp - -user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (master) -$ git status -On branch master -Untracked files: - (use "git add ..." to include in what will be committed) - bin/ - obj/ - -nothing added to commit but untracked files present (use "git add" to track) - -user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (master) -$ git status -On branch master -Changes not staged for commit: - (use "git add ..." to update what will be committed) - (use "git restore ..." to discard changes in working directory) - modified: main.cpp - -Untracked files: - (use "git add ..." to include in what will be committed) - bin/ - obj/ - -no changes added to commit (use "git add" and/or "git commit -a") - -user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (master) -$ ^?^C - -user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (master) -$ git add main.cpp - -user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (master) -$ git add project.cbp - -user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (master) -$ git commit -m 'code; добавлен ввод двух чисел' -[master c9a4795] code; добавлен ввод двух чисел - 1 file changed, 3 insertions(+), 1 deletion(-) - -user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (master) -$ git add main.cpp - -user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (master) -$ git commit -m 'code: Добавлен ввод двух чисел' -[master 78d9888] code: Добавлен ввод двух чисел - 1 file changed, 1 insertion(+) - -user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (master) -$ git add -u - -user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (master) -$ git commit -m 'code: добавлен вывод суммы двух чисел' -[master 4e1721a] code: добавлен вывод суммы двух чисел - 1 file changed, 1 insertion(+), 1 deletion(-) - -user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (master) -$ git commit -a -m "code: добавлен вывод разности двух чисел" -[master 31b8488] code: добавлен вывод разности двух чисел - 1 file changed, 2 insertions(+), 1 deletion(-) - -user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (master) -$ git status -On branch master -Untracked files: - (use "git add ..." to include in what will be committed) - .gitignore - project.depend - -nothing added to commit but untracked files present (use "git add" to track) - -user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (master) -$ git add .gitignore - -user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (master) -$ git commit -m 'git: добавлено игнорирование файлов' -[master 5d5062e] git: добавлено игнорирование файлов - 1 file changed, 2 insertions(+) - create mode 100644 .gitignore - -user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (master) -$ git log -commit 5d5062e20fb7eda46a513b4c76bd314618008987 (HEAD -> master) -Author: Alice (PakhomovaAY) -Date: Sat Mar 15 20:50:50 2025 +0300 - - git: добавлено игнорирование файлов - -commit 31b8488bcb3bf97ce9fde4fde11c67975929cb0a -Author: Alice (PakhomovaAY) -Date: Fri Mar 14 22:31:05 2025 +0300 - - code: добавлен вывод разности двух чисел - -commit 4e1721ac168eadcf85ee167f3ff47c168c45c427 -Author: Alice (PakhomovaAY) -Date: Fri Mar 14 22:28:27 2025 +0300 - - code: добавлен вывод суммы двух чисел - -commit 78d988847bf7e7d5b4dbaeac8d2b7b2b0855af8d -Author: Alice (PakhomovaAY) -Date: Fri Mar 14 22:22:02 2025 +0300 - - code: Добавлен ввод двух чисел - -commit c9a4795080dcd29a0659a612739fc8e9f4319885 -Author: Alice (PakhomovaAY) -Date: Fri Mar 14 22:03:37 2025 +0300 - - code; добавлен ввод двух чисел - -commit b7b5f76b3d647cb72a3cdcd78f260bdf18b83687 -Author: Alice (PakhomovaAY) -Date: Mon Mar 10 15:13:00 2025 +0300 - - build: добавлен файл проекта - -commit e465eca66e4c8ab37b3178059b8996eb39d07583 -Author: Alice (PakhomovaAY) -Date: Mon Mar 10 15:03:39 2025 +0300 - - code: заготовка программы - -user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (master) -$ git log --stat -commit 5d5062e20fb7eda46a513b4c76bd314618008987 (HEAD -> master) -Author: Alice (PakhomovaAY) -Date: Sat Mar 15 20:50:50 2025 +0300 - - git: добавлено игнорирование файлов - - .gitignore | 2 ++ - 1 file changed, 2 insertions(+) - -commit 31b8488bcb3bf97ce9fde4fde11c67975929cb0a -Author: Alice (PakhomovaAY) -Date: Fri Mar 14 22:31:05 2025 +0300 - - code: добавлен вывод разности двух чисел - - main.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -commit 4e1721ac168eadcf85ee167f3ff47c168c45c427 -Author: Alice (PakhomovaAY) -Date: Fri Mar 14 22:28:27 2025 +0300 - - code: добавлен вывод суммы двух чисел - - main.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 78d988847bf7e7d5b4dbaeac8d2b7b2b0855af8d -Author: Alice (PakhomovaAY) -Date: Fri Mar 14 22:22:02 2025 +0300 - - code: Добавлен ввод двух чисел - - main.cpp | 1 + - 1 file changed, 1 insertion(+) - -commit c9a4795080dcd29a0659a612739fc8e9f4319885 -Author: Alice (PakhomovaAY) -Date: Fri Mar 14 22:03:37 2025 +0300 - - code; добавлен ввод двух чисел - - main.cpp | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -commit b7b5f76b3d647cb72a3cdcd78f260bdf18b83687 -Author: Alice (PakhomovaAY) -Date: Mon Mar 10 15:13:00 2025 +0300 - - build: добавлен файл проекта - - project.cbp | 40 ++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 40 insertions(+) - -commit e465eca66e4c8ab37b3178059b8996eb39d07583 -Author: Alice (PakhomovaAY) -Date: Mon Mar 10 15:03:39 2025 +0300 - - code: заготовка программы - - main.cpp | 9 +++++++++ - 1 file changed, 9 insertions(+) - -user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (master) -$ git log --oneline --decorate -5d5062e (HEAD -> master) git: добавлено игнорирование файлов -31b8488 code: добавлен вывод разности двух чисел -4e1721a code: добавлен вывод суммы двух чисел -78d9888 code: Добавлен ввод двух чисел -c9a4795 code; добавлен ввод двух чисел -b7b5f76 build: добавлен файл проекта -e465eca code: заготовка программы - -user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (master) -$ git log --oneline --decorate --all --graph -* 5d5062e (HEAD -> master) git: добавлено игнорирование файлов -* 31b8488 code: добавлен вывод разности двух чисел -* 4e1721a code: добавлен вывод суммы двух чисел -* 78d9888 code: Добавлен ввод двух чисел -* c9a4795 code; добавлен ввод двух чисел -* b7b5f76 build: добавлен файл проекта -* e465eca code: заготовка программы - -user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (master) -$ git log --grep "build:" -commit b7b5f76b3d647cb72a3cdcd78f260bdf18b83687 -Author: Alice (PakhomovaAY) -Date: Mon Mar 10 15:13:00 2025 +0300 - - build: добавлен файл проекта - -user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (master) -$ git log -- project.cbp -commit b7b5f76b3d647cb72a3cdcd78f260bdf18b83687 -Author: Alice (PakhomovaAY) -Date: Mon Mar 10 15:13:00 2025 +0300 - - build: добавлен файл проекта - -user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (master) -$ git show HEAD -commit 5d5062e20fb7eda46a513b4c76bd314618008987 (HEAD -> master) -Author: Alice (PakhomovaAY) -Date: Sat Mar 15 20:50:50 2025 +0300 - - git: добавлено игнорирование файлов - -diff --git a/.gitignore b/.gitignore -new file mode 100644 -index 0000000..4c7473d ---- /dev/null -+++ b/.gitignore -@@ -0,0 +1,2 @@ -+/bin -+/obj - -user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (master) -$ git show main HEAD~1 -fatal: ambiguous argument 'main': unknown revision or path not in the working tree. -Use '--' to separate paths from revisions, like this: -'git [...] -- [...]' - -user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (master) -$ git show HEAD~1 -commit 31b8488bcb3bf97ce9fde4fde11c67975929cb0a -Author: Alice (PakhomovaAY) -Date: Fri Mar 14 22:31:05 2025 +0300 - - code: добавлен вывод разности двух чисел - -diff --git a/main.cpp b/main.cpp -index 6de6dd2..5371b30 100644 ---- a/main.cpp -+++ b/main.cpp -@@ -7,6 +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'; - return 0; - } - -user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (master) -$ git show main~1 -fatal: ambiguous argument 'main~1': unknown revision or path not in the working tree. -Use '--' to separate paths from revisions, like this: -'git [...] -- [...]' - -user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (master) -$ git show main ~1 -fatal: ambiguous argument 'main': unknown revision or path not in the working tree. -Use '--' to separate paths from revisions, like this: -'git [...] -- [...]' - -user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (master) -$ git show 31b8488 -commit 31b8488bcb3bf97ce9fde4fde11c67975929cb0a -Author: Alice (PakhomovaAY) -Date: Fri Mar 14 22:31:05 2025 +0300 - - code: добавлен вывод разности двух чисел - -diff --git a/main.cpp b/main.cpp -index 6de6dd2..5371b30 100644 ---- a/main.cpp -+++ b/main.cpp -@@ -7,6 +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'; - return 0; - } - -user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (master) -$ git show main HEAD~1 -fatal: ambiguous argument 'main': unknown revision or path not in the working tree. -Use '--' to separate paths from revisions, like this: -'git [...] -- [...]' - -user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (master) -$ git diff -diff --git a/main.cpp b/main.cpp -index 5371b30..fbd9488 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'; - return 0; - } - -user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (master) -$ -git \ No newline at end of file +