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

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

{\rtf1\ansi\ansicpg1251\cocoartf2761
\cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fnil\fcharset0 Menlo-Regular;\f1\fnil\fcharset0 Menlo-Bold;\f2\froman\fcharset0 Times-Roman;
\f3\fnil\fcharset0 .SFNS-Regular_wdth_opsz180000_GRAD_wght2580000;}
{\colortbl;\red255\green255\blue255;\red0\green0\blue0;\red255\green255\blue255;\red0\green0\blue0;
\red32\green34\blue44;\red173\green179\blue190;\red255\green255\blue255;\red202\green51\blue35;\red243\green216\blue255;
\red255\green255\blue255;\red252\green255\blue69;\red243\green217\blue255;\red254\green255\blue71;\red170\green171\blue37;
\red56\green185\blue199;\red57\green192\blue38;\red254\green255\blue72;}
{\*\expandedcolortbl;;\cssrgb\c0\c0\c0;\cssrgb\c100000\c100000\c99985\c0;\csgray\c0;
\cssrgb\c16471\c18039\c22745;\cssrgb\c73439\c75405\c79235;\cssrgb\c100000\c100000\c100000\c0;\cssrgb\c83899\c28663\c18026;\cssrgb\c96477\c88355\c100000;
\cssrgb\c100000\c100000\c99971\c0;\cssrgb\c98998\c98790\c33549;\cssrgb\c96623\c88503\c100000;\cssrgb\c99501\c99397\c34405;\cssrgb\c72331\c71682\c18599;
\cssrgb\c25546\c77007\c82023;\cssrgb\c25706\c77963\c19557;\cssrgb\c99751\c99699\c34832;}
{\*\listtable{\list\listtemplateid1\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid1\'01\uc0\u8226 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid1}
{\list\listtemplateid2\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid101\'01\uc0\u8226 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{circle\}}{\leveltext\leveltemplateid102\'01\uc0\u9702 ;}{\levelnumbers;}\fi-360\li1440\lin1440 }{\listname ;}\listid2}}
{\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}{\listoverride\listid2\listoverridecount0\ls2}}
\paperw11900\paperh16840\margl1440\margr1440\vieww22740\viewh11660\viewkind0
\deftab720
\pard\pardeftab720\partightenfactor0
\f0\fs24 \cf2 \cb3 \expnd0\expndtw0\kerning0
\uc0\u1054 \u1090 \u1095 \u1077 \u1090 \u1087 \u1086 \u1083 \u1072 \u1073 \u1086 \u1088 \u1072 \u1090 \u1086 \u1088 \u1085 \u1086 \u1081 \u1088 \u1072 \u1073 \u1086 \u1090 \u1077 \u8470 2 "\u1057 \u1080 \u1089 \u1090 \u1077 \u1084 \u1072 \u1082 \u1086 \u1085 \u1090 \u1088 \u1086 \u1083 \u1103 \u1074 \u1077 \u1088 \u1089 \u1080 \u1081 Git"\
\
\uc0\u1042 \u1099 \u1087 \u1086 \u1083 \u1085 \u1080 \u1083 \u1072 : \u1056 \u1099 \u1073 \u1072 \u1082 \u1086 \u1074 \u1072 \u1057 .\u1040 .\
\uc0\u1043 \u1088 \u1091 \u1087 \u1087 \u1072 : \u1040 -02-24\
\uc0\u1055 \u1088 \u1086 \u1074 \u1077 \u1088 \u1080 \u1083 : \
\
\uc0\u1055 \u1088 \u1080 \u1084 \u1077 \u1095 \u1072 \u1085 \u1080 \u1077 : \u1088 \u1072 \u1073 \u1086 \u1090 \u1072 \u1074 \u1099 \u1087 \u1086 \u1083 \u1085 \u1103 \u1083 \u1072 \u1089 \u1100 \u1085 \u1072 MacOS.\cf4 \cb1 \kerning1\expnd0\expndtw0 \CocoaLigature0 \
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardeftab720\pardirnatural\partightenfactor0
\cf2 \cb3 \
\pard\pardeftab720\partightenfactor0
\cf2 \cb3 \expnd0\expndtw0\kerning0
\CocoaLigature1 1. \uc0\u1057 \u1086 \u1079 \u1076 \u1072 \u1083 \u1072 \u1085 \u1072 \u1088 \u1072 \u1073 \u1086 \u1095 \u1077 \u1084 \u1089 \u1090 \u1086 \u1083 \u1077 \u1082 \u1072 \u1090 \u1072 \u1083 \u1086 \u1075 lab02 \u1080 \u1089 \u1086 \u1079 \u1076 \u1072 \u1083 \u1072 \u1082 \u1072 \u1090 \u1072 \u1083 \u1086 \u1075 \u1080 \u1040 \u1083 \u1080 \u1089 \u1099 \u1080 \u1041 \u1086 \u1073 \u1072 , \u1089 \u1086 \u1079 \u1076 \u1072 \u1083 \u1072 \u1082 \u1072 \u1090 \u1072 \u1083 \u1086 \u1075 "project",\
\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrt\brdrnil \trbrdrl\brdrnil \trbrdrt\brdrnil \trbrdrr\brdrnil
\clvertalt \clcbpat5 \clwWidth21010\clftsWidth3 \clbrdrt\brdrnil \clbrdrl\brdrnil \clbrdrb\brdrnil \clbrdrr\brdrnil \clpadl100 \clpadr20 \gaph\cellx8640
\pard\intbl\itap1\pardeftab720\partightenfactor0
\cf2 \cb3 \uc0\u1080 \u1079 \u1091 \u1095 \u1080 \u1083 \u1072 \u1082 \u1086 \u1084 \u1072 \u1085 \u1076 \u1091 "cd" \u1074 \u1087 \u1088 \u1086 \u1094 \u1077 \u1089 \u1089 \u1077 :\cell \lastrow\row
\pard\pardeftab720\partightenfactor0
\cf2 \kerning1\expnd0\expndtw0 \CocoaLigature0 \
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardeftab720\pardirnatural\partightenfactor0
\cf2 svetlanarybakova@MacBook-Pro-Svetlana ~ % cd desktop\
svetlanarybakova@MacBook-Pro-Svetlana desktop % cd lab02\
svetlanarybakova@MacBook-Pro-Svetlana lab02 % cd alice\
svetlanarybakova@MacBook-Pro-Svetlana alice % cd ..\
svetlanarybakova@MacBook-Pro-Svetlana lab02 % cd alice\
svetlanarybakova@MacBook-Pro-Svetlana alice % cd project\
svetlanarybakova@MacBook-Pro-Svetlana project % cd ..\
svetlanarybakova@MacBook-Pro-Svetlana alice % cd project\
\
2.\expnd0\expndtw0\kerning0
\CocoaLigature1 \uc0\u1048 \u1085 \u1080 \u1094 \u1080 \u1072 \u1083 \u1080 \u1079 \u1080 \u1088 \u1086 \u1074 \u1072 \u1083 \u1072 \u1088 \u1077 \u1087 \u1086 \u1079 \u1080 \u1090 \u1072 \u1088 \u1080 \u1081 :\cf6 \cb7 \
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardeftab720\pardirnatural\partightenfactor0
\cf2 \kerning1\expnd0\expndtw0 \CocoaLigature0 \
svetlanarybakova@MacBook-Pro-Svetlana project % git init\
\
Init\cf4 \cb1 ialized empty Git repository in /Users/svetlanarybakova/Desktop/lab02/alice/project/.git/\
\
3. \cf2 \cb3 \expnd0\expndtw0\kerning0
\CocoaLigature1 \uc0\u1055 \u1077 \u1088 \u1077 \u1080 \u1084 \u1077 \u1085 \u1086 \u1074 \u1072 \u1083 \u1072 \u1074 \u1077 \u1090 \u1082 \u1091 \u1074 "main":\cf4 \cb1 \kerning1\expnd0\expndtw0 \CocoaLigature0 \
svetlanarybakova@MacBook-Pro-Svetlana project % git branch -m main\
\
4.\cf2 \cb3 \expnd0\expndtw0\kerning0
\CocoaLigature1 \uc0\u1053 \u1072 \u1089 \u1090 \u1088 \u1086 \u1080 \u1083 \u1072 \u1080 \u1084 \u1103 \u1087 \u1086 \u1083 \u1100 \u1079 \u1086 \u1074 \u1072 \u1090 \u1077 \u1083 \u1103 \u1080 email:\cf4 \cb1 \kerning1\expnd0\expndtw0 \CocoaLigature0 \
svetlanarybakova@MacBook-Pro-Svetlana project % git config user.name 'Alice (RybakovaSA)' \
git config user.email 'RybakovaSA@mpei.ru'\
\
5.\cf2 \cb3 \expnd0\expndtw0\kerning0
\CocoaLigature1 \uc0\u1055 \u1088 \u1086 \u1074 \u1077 \u1088 \u1080 \u1083 \u1072 \u1089 \u1090 \u1072 \u1090 \u1091 \u1089 \u1088 \u1077 \u1087 \u1086 \u1079 \u1080 \u1090 \u1086 \u1088 \u1080 \u1103 :\cf4 \cb1 \kerning1\expnd0\expndtw0 \CocoaLigature0 \
\
svetlanarybakova@MacBook-Pro-Svetlana project % git status\
\
On branch main\
\
No commits yet\
\
Untracked files:\
(use "git add <file>..." to include in what will be committed)\
\cf8 DerivedData/\cf4 \
\cf8 main.cpp\cf4 \
\cf8 project.xcodeproj/\cf4 \
\
nothing added to commit but untracked files present (use "git add" to track)\
svetlanarybakova@MacBook-Pro-Svetlana project % git add main.cpp\
\
6.\cf2 \cb3 \expnd0\expndtw0\kerning0
\CocoaLigature1 \uc0\u1044 \u1086 \u1073 \u1072 \u1074 \u1080 \u1083 \u1072 \u1092 \u1072 \u1081 \u1083 \u1099 main.cpp \u1074 \u1080 \u1085 \u1076 \u1077 \u1082 \u1089 \u1080 \u1079 \u1072 \u1082 \u1086 \u1084 \u1084 \u1080 \u1090 \u1080 \u1083 \u1072 \u1080 \u1093 :\cf4 \cb1 \kerning1\expnd0\expndtw0 \CocoaLigature0 \
\
svetlanarybakova@MacBook-Pro-Svetlana project % git commit -m 'code: \uc0\u1079 \u1072 \u1075 \u1086 \u1090 \u1086 \u1074 \u1082 \u1072 \u1087 \u1088 \u1086 \u1075 \u1088 \u1072 \u1084 \u1084 \u1099 '\
\
[main (root-commit) 0fcaee1] code: \uc0\u1079 \u1072 \u1075 \u1086 \u1090 \u1086 \u1074 \u1082 \u1072 \u1087 \u1088 \u1086 \u1075 \u1088 \u1072 \u1084 \u1084 \u1099 \
1 file changed, 14 insertions(+)\
create mode 100644 main.cpp\
svetlanarybakova@MacBook-Pro-Svetlana project % git add project.xcodeproj\
svetlanarybakova@MacBook-Pro-Svetlana project % git commit -m 'build: \uc0\u1076 \u1086 \u1073 \u1072 \u1074 \u1083 \u1077 \u1085 \u1092 \u1072 \u1081 \u1083 \u1087 \u1088 \u1086 \u1077 \u1082 \u1090 \u1072 '\
\
[main 8388df1] build: \uc0\u1076 \u1086 \u1073 \u1072 \u1074 \u1083 \u1077 \u1085 \u1092 \u1072 \u1081 \u1083 \u1087 \u1088 \u1086 \u1077 \u1082 \u1090 \u1072 \
7 files changed, 326 insertions(+)\
create mode 100644 project.xcodeproj/project.pbxproj\
create mode 100644 project.xcodeproj/project.xcworkspace/contents.xcworkspacedata\
create mode 100644 project.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist\
create mode 100644 project.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings\
create mode 100644 project.xcodeproj/project.xcworkspace/xcuserdata/svetlanarybakova.xcuserdatad/UserInterfaceState.xcuserstate\
create mode 100644 project.xcodeproj/project.xcworkspace/xcuserdata/svetlanarybakova.xcuserdatad/WorkspaceSettings.xcsettings\
create mode 100644 project.xcodeproj/xcuserdata/svetlanarybakova.xcuserdatad/xcschemes/xcschememanagement.plist\
\
\
svetlanarybakova@MacBook-Pro-Svetlana project % 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)\
\cf8 modified: main.cpp\cf4 \
\cf8 modified: project.xcodeproj/project.xcworkspace/xcuserdata/svetlanarybakova.xcuserdatad/UserInterfaceState.xcuserstate\cf4 \
\
Untracked files:\
(use "git add <file>..." to include in what will be committed)\
\cf8 DerivedData/\cf4 \
\
no changes added to commit (use "git add" and/or "git commit -a")\
svetlanarybakova@MacBook-Pro-Svetlana project % git add main.cpp\
\
7.\cf2 \cb3 \expnd0\expndtw0\kerning0
\CocoaLigature1 \uc0\u1044 \u1086 \u1073 \u1072 \u1074 \u1080 \u1083 \u1072 \u1092 \u1072 \u1081 \u1083 \u1099 main.cpp \u1074 \u1080 \u1085 \u1076 \u1077 \u1082 \u1089 \u1080 \u1079 \u1072 \u1082 \u1086 \u1084 \u1084 \u1080 \u1090 \u1080 \u1083 \u1072 \u1080 \u1093 :\cf4 \cb1 \kerning1\expnd0\expndtw0 \CocoaLigature0 \
git commit -m "code: \uc0\u1074 \u1099 \u1074 \u1086 \u1076 \u1040 \u1080 \u1042 " \
\
[main a4ecbfa] code: \uc0\u1074 \u1099 \u1074 \u1086 \u1076 \u1040 \u1080 \u1042 \
1 file changed, 5 insertions(+), 10 deletions(-)\
svetlanarybakova@MacBook-Pro-Svetlana project % git add -u\
git commit -m "code: \uc0\u1089 \u1091 \u1084 \u1084 \u1072 \u1040 \u1080 \u1042 "\
\
[main 551b8a3] code: \uc0\u1089 \u1091 \u1084 \u1084 \u1072 \u1040 \u1080 \u1042 \
2 files changed, 1 insertion(+), 1 deletion(-)\
\
svetlanarybakova@MacBook-Pro-Svetlana project % git commit -a -m "code: \uc0\u1088 \u1072 \u1079 \u1085 \u1086 \u1089 \u1090 \u1100 \u1040 \u1080 \u1042 "\
[main 73b73f1] code: \uc0\u1088 \u1072 \u1079 \u1085 \u1086 \u1089 \u1090 \u1100 \u1040 \u1080 \u1042 \
2 files changed, 2 insertions(+), 1 deletion(-)\
\
8. \uc0\u1057 \u1086 \u1079 \u1076 \u1072 \u1085 \u1080 \u1077 \u1080 \u1079 \u1072 \u1087 \u1086 \u1083 \u1085 \u1077 \u1085 \u1080 \u1077 .gitignore\
\
svetlanarybakova@MacBook-Pro-Svetlana project % touch .gitignore\
svetlanarybakova@MacBook-Pro-Svetlana project % nano .gitignore\
svetlanarybakova@MacBook-Pro-Svetlana project % 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)\
\cf8 modified: project.xcodeproj/project.xcworkspace/xcuserdata/svetlanarybakova.xcuserdatad/UserInterfaceState.xcuserstate\cf4 \
\
Untracked files:\
(use "git add <file>..." to include in what will be committed)\
\cf8 .gitignore\cf4 \
\
no changes added to commit (use "git add" and/or "git commit -a")\
\
9. \uc0\u1044 \u1086 \u1073 \u1072 \u1074 \u1083 \u1077 \u1085 \u1080 \u1077 \u1085 \u1086 \u1074 \u1086 \u1075 \u1086 \u1092 \u1072 \u1081 \u1083 \u1072 \u1074 .gitignore\
\
svetlanarybakova@MacBook-Pro-Svetlana project % echo "project.xcodeproj/project.xcworkspace/xcuserdata/" >> .gitignore\
git rm --cached -r project.xcodeproj/project.xcworkspace/xcuserdata/\
git commit -m "Ignore Xcode user data"\
\
rm 'project.xcodeproj/project.xcworkspace/xcuserdata/svetlanarybakova.xcuserdatad/UserInterfaceState.xcuserstate'\
rm 'project.xcodeproj/project.xcworkspace/xcuserdata/svetlanarybakova.xcuserdatad/WorkspaceSettings.xcsettings'\
[main b4c965e] Ignore Xcode user data\
2 files changed, 16 deletions(-)\
delete mode 100644 project.xcodeproj/project.xcworkspace/xcuserdata/svetlanarybakova.xcuserdatad/UserInterfaceState.xcuserstate\
delete mode 100644 project.xcodeproj/project.xcworkspace/xcuserdata/svetlanarybakova.xcuserdatad/WorkspaceSettings.xcsettings\
\
svetlanarybakova@MacBook-Pro-Svetlana project % nano .gitignore\
\
10. \uc0\u1050 \u1086 \u1084 \u1084 \u1080 \u1090 .gitignore\
\
svetlanarybakova@MacBook-Pro-Svetlana project % git add .gitignore\
svetlanarybakova@MacBook-Pro-Svetlana project % git commit -m "git: \uc0\u1089 \u1086 \u1079 \u1076 \u1072 \u1085 .gitignore"\
[main 0f5bfc9] git: \uc0\u1089 \u1086 \u1079 \u1076 \u1072 \u1085 .gitignore\
1 file changed, 20 insertions(+)\
create mode 100644 .gitignore\
\
11\cf0 \cb3 .\cf9 \cb10 \cb11 \expnd0\expndtw0\kerning0
\CocoaLigature1 git log \uc0\u1087 \u1086 \u1082 \u1072 \u1079 \u1099 \u1074 \u1072 \u1077 \u1090 \u1090 \u1077 \u1082 \u1089 \u1090 \u1089 \'a0\u1087 \u1088 \u1086 \u1082 \u1088 \u1091 \u1090 \u1082 \u1086 \u1081 \cf12 \cb7 \kerning1\expnd0\expndtw0 \CocoaLigature0 \
\expnd0\expndtw0\kerning0
\CocoaLigature1 \cf9 \cb13 git log --stat \uc0\u1087 \u1086 \u1082 \u1072 \u1079 \u1099 \u1074 \u1072 \u1077 \u1090 \u1092 \u1072 \u1081 \u1083 \u1099 , \u1080 \u1079 \u1084 \u1077 \u1085 \u1077 \u1085 \u1085 \u1099 \u1077 \u1074 \'a0\u1082 \u1086 \u1084 \u1084 \u1080 \u1090 \u1072 \u1093 .\cf0 \cb1 \kerning1\expnd0\expndtw0 \CocoaLigature0 \
\cf4 \
svetlanarybakova@MacBook-Pro-Svetlana project % git log\
\cf14 commit 0f5bfc913ce16d9ae548515a1456a456975b2c10 (
\f1\b \cf15 HEAD -> \cf16 main
\f0\b0 \cf14 )\cf4 \
Author: Alice (RybakovaSA) <RybakovaSA@mpei.ru>\
Date: Sun Mar 30 20:43:23 2025 +0300\
\
git: \uc0\u1089 \u1086 \u1079 \u1076 \u1072 \u1085 .gitignore\
\
\cf14 commit b4c965edba5eba8235e0330fd840c79e2728320b\cf4 \
Author: Alice (RybakovaSA) <RybakovaSA@mpei.ru>\
Date: Sun Mar 30 20:41:00 2025 +0300\
\
Ignore Xcode user data\
\
\cf14 commit 73b73f1d3f629249aa43ab73a19609d643858457\cf4 \
Author: Alice (RybakovaSA) <RybakovaSA@mpei.ru>\
Date: Sun Mar 30 20:37:18 2025 +0300\
\
code: \uc0\u1088 \u1072 \u1079 \u1085 \u1086 \u1089 \u1090 \u1100 \u1040 \u1080 \u1042 \
\
\cf14 commit 551b8a3a305f96af27fd2fd095c5e03e005280d2\cf4 \
Author: Alice (RybakovaSA) <RybakovaSA@mpei.ru>\
Date: Sun Mar 30 20:35:03 2025 +0300\
\
code: \uc0\u1089 \u1091 \u1084 \u1084 \u1072 \u1040 \u1080 \u1042 \
svetlanarybakova@MacBook-Pro-Svetlana project % git log --stat\
\cf14 commit 0f5bfc913ce16d9ae548515a1456a456975b2c10 (
\f1\b \cf15 HEAD -> \cf16 main
\f0\b0 \cf14 )\cf4 \
Author: Alice (RybakovaSA) <RybakovaSA@mpei.ru>\
Date: Sun Mar 30 20:43:23 2025 +0300\
\
git: \uc0\u1089 \u1086 \u1079 \u1076 \u1072 \u1085 .gitignore\
\
.gitignore | 20 \cf16 ++++++++++++++++++++\cf4 \
1 file changed, 20 insertions(+)\
\
\pard\pardeftab720\sa240\partightenfactor0
\cf0 \expnd0\expndtw0\kerning0
\CocoaLigature1 (\uc0\u1069 \u1090 \u1086 \u1090 \u1074 \u1099 \u1074 \u1086 \u1076 \u1086 \u1079 \u1085 \u1072 \u1095 \u1072 \u1077 \u1090 :\
\pard\tx220\tx720\pardeftab720\li720\fi-720\sa240\partightenfactor0
\ls1\ilvl0\cf0 \kerning1\expnd0\expndtw0 {\listtext \uc0\u8226 }\expnd0\expndtw0\kerning0
\uc0\u1041 \u1099 \u1083 \u1080 \u1079 \u1084 \u1077 \u1085 \u1077 \u1085 \u1086 \u1076 \u1080 \u1085 \u1092 \u1072 \u1081 \u1083
\fs26 .gitignore
\fs24 .\
\ls1\ilvl0\kerning1\expnd0\expndtw0 {\listtext \uc0\u8226 }\expnd0\expndtw0\kerning0
\uc0\u1042 \u1092 \u1072 \u1081 \u1083 \u1076 \u1086 \u1073 \u1072 \u1074 \u1083 \u1077 \u1085 \u1086 20 \u1085 \u1086 \u1074 \u1099 \u1093 \u1089 \u1090 \u1088 \u1086 \u1082 (\u1085 \u1077 \u1090 \u1091 \u1076 \u1072 \u1083 \u1077 \u1085 \u1085 \u1099 \u1093 \u1089 \u1090 \u1088 \u1086 \u1082 ).\
\ls1\ilvl0\kerning1\expnd0\expndtw0 {\listtext \uc0\u8226 }\expnd0\expndtw0\kerning0
\uc0\u1057 \u1090 \u1072 \u1090 \u1080 \u1089 \u1090 \u1080 \u1082 \u1072 \u1080 \u1079 \u1084 \u1077 \u1085 \u1077 \u1085 \u1080 \u1081 \u1086 \u1090 \u1086 \u1073 \u1088 \u1072 \u1078 \u1072 \u1077 \u1090 \u1089 \u1103 \u1074 \u1074 \u1080 \u1076 \u1077 \u1082 \u1086 \u1083 \u1080 \u1095 \u1077 \u1089 \u1090 \u1074 \u1072 \u1076 \u1086 \u1073 \u1072 \u1074 \u1083 \u1077 \u1085 \u1085 \u1099 \u1093 (
\fs26 +
\fs24 ) \uc0\u1080 \u1091 \u1076 \u1072 \u1083 \u1077 \u1085 \u1085 \u1099 \u1093 (
\fs26 -
\fs24 ) \uc0\u1089 \u1090 \u1088 \u1086 \u1082 .)
\f2 \
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardeftab720\pardirnatural\partightenfactor0
\f0 \cf4 \kerning1\expnd0\expndtw0 \CocoaLigature0 \
\
\cf14 commit b4c965edba5eba8235e0330fd840c79e2728320b\cf4 \
Author: Alice (RybakovaSA) <RybakovaSA@mpei.ru>\
Date: Sun Mar 30 20:41:00 2025 +0300\
\
Ignore Xcode user data\
\
.../UserInterfaceState.xcuserstate | Bin \cf8 13879\cf4 -> \cf16 0\cf4 bytes\
.../WorkspaceSettings.xcsettings | 16 \cf8 ----------------\cf4 \
2 files changed, 16 deletions(-)\
\
\cf14 commit 73b73f1d3f629249aa43ab73a19609d643858457\cf4 \
Author: Alice (RybakovaSA) <RybakovaSA@mpei.ru>\
Date: Sun Mar 30 20:37:18 2025 +0300\
\
\
12.\cf9 \cb17 \expnd0\expndtw0\kerning0
\CocoaLigature1 git log --oneline --decorate \uc0\u1087 \u1086 \u1082 \u1072 \u1079 \u1099 \u1074 \u1072 \u1077 \u1090 \u1082 \u1086 \u1084 \u1084 \u1080 \u1090 \u1099 \u1082 \u1086 \u1084 \u1087 \u1072 \u1082 \u1090 \u1085 \u1086 , \u1072 \u1090 \u1072 \u1082 \u1078 \u1077 \u1087 \u1086 \u1082 \u1072 \u1079 \u1099 \u1074 \u1072 \u1077 \u1090 \u1089 \u1089 \u1099 \u1083 \u1082 \u1080 , \u1082 \u1086 \u1085 \u1094 \u1099 \u1074 \u1077 \u1090 \u1086 \u1082 \u1080 \u1090 \u1101 \u1075 \u1080 .\cf12 \cb7 \
\cf2 \kerning1\expnd0\expndtw0 \CocoaLigature0 \
\cf4 \cb1 \
svetlanarybakova@MacBook-Pro-Svetlana project % git log --oneline --decorate\
\cf14 0f5bfc9 (
\f1\b \cf15 HEAD -> \cf16 main
\f0\b0 \cf14 )\cf4 git: \uc0\u1089 \u1086 \u1079 \u1076 \u1072 \u1085 .gitignore\
\cf14 b4c965e\cf4 Ignore Xcode user data\
\cf14 73b73f1\cf4 code: \uc0\u1088 \u1072 \u1079 \u1085 \u1086 \u1089 \u1090 \u1100 \u1040 \u1080 \u1042 \
\cf14 551b8a3\cf4 code: \uc0\u1089 \u1091 \u1084 \u1084 \u1072 \u1040 \u1080 \u1042 \
\cf14 a4ecbfa\cf4 code: \uc0\u1074 \u1099 \u1074 \u1086 \u1076 \u1040 \u1080 \u1042 \
\cf14 8388df1\cf4 build: \uc0\u1076 \u1086 \u1073 \u1072 \u1074 \u1083 \u1077 \u1085 \u1092 \u1072 \u1081 \u1083 \u1087 \u1088 \u1086 \u1077 \u1082 \u1090 \u1072 \
\cf14 0fcaee1\cf4 code: \uc0\u1079 \u1072 \u1075 \u1086 \u1090 \u1086 \u1074 \u1082 \u1072 \u1087 \u1088 \u1086 \u1075 \u1088 \u1072 \u1084 \u1084 \u1099 \
\
13.\cf9 \cb17 \expnd0\expndtw0\kerning0
\CocoaLigature1 git log --oneline --decorate --all --graph \uc0\u1076 \u1077 \u1083 \u1072 \u1077 \u1090 \u1090 \u1086 \'a0\u1078 \u1077 \u1076 \u1083 \u1103 \'a0\u1074 \u1089 \u1077 \u1093 \u1074 \u1077 \u1090 \u1086 \u1082 , \u1087 \u1088 \u1080 \u1095 \u1077 \u1084 \u1082 \u1086 \u1084 \u1084 \u1080 \u1090 \u1099 \u1086 \u1090 \u1086 \u1073 \u1088 \u1072 \u1078 \u1072 \u1102 \u1090 \u1089 \u1103 \u1074 \u1090 \u1077 \u1088 \u1084 \u1080 \u1085 \u1072 \u1083 \u1077 \u1074 \u1074 \u1080 \u1076 \u1077 \u1076 \u1077 \u1088 \u1077 \u1074 \u1072 \cf4 \cb1 \kerning1\expnd0\expndtw0 \CocoaLigature0 \
\
svetlanarybakova@MacBook-Pro-Svetlana project % git log --oneline --decorate --all --graph\
* \cf14 0f5bfc9 (
\f1\b \cf15 HEAD -> \cf16 main
\f0\b0 \cf14 )\cf4 git: \uc0\u1089 \u1086 \u1079 \u1076 \u1072 \u1085 .gitignore\
* \cf14 b4c965e\cf4 Ignore Xcode user data\
* \cf14 73b73f1\cf4 code: \uc0\u1088 \u1072 \u1079 \u1085 \u1086 \u1089 \u1090 \u1100 \u1040 \u1080 \u1042 \
* \cf14 551b8a3\cf4 code: \uc0\u1089 \u1091 \u1084 \u1084 \u1072 \u1040 \u1080 \u1042 \
* \cf14 a4ecbfa\cf4 code: \uc0\u1074 \u1099 \u1074 \u1086 \u1076 \u1040 \u1080 \u1042 \
* \cf14 8388df1\cf4 build: \uc0\u1076 \u1086 \u1073 \u1072 \u1074 \u1083 \u1077 \u1085 \u1092 \u1072 \u1081 \u1083 \u1087 \u1088 \u1086 \u1077 \u1082 \u1090 \u1072 \
* \cf14 0fcaee1\cf4 code: \uc0\u1079 \u1072 \u1075 \u1086 \u1090 \u1086 \u1074 \u1082 \u1072 \u1087 \u1088 \u1086 \u1075 \u1088 \u1072 \u1084 \u1084 \u1099 \
\
svetlanarybakova@MacBook-Pro-Svetlana project % git log --grep "build:"\
\cf14 commit 8388df181b85cf2b81b9e82ea2d9653a01ea4464\cf4 \
Author: Alice (RybakovaSA) <RybakovaSA@mpei.ru>\
Date: Sun Mar 30 20:28:16 2025 +0300\
\
\f1\b \cf8 build:
\f0\b0 \cf4 \uc0\u1076 \u1086 \u1073 \u1072 \u1074 \u1083 \u1077 \u1085 \u1092 \u1072 \u1081 \u1083 \u1087 \u1088 \u1086 \u1077 \u1082 \u1090 \u1072 \
\
svetlanarybakova@MacBook-Pro-Svetlana project % git log -- project.xcodeproj\
\cf14 commit b4c965edba5eba8235e0330fd840c79e2728320b\cf4 \
Author: Alice (RybakovaSA) <RybakovaSA@mpei.ru>\
Date: Sun Mar 30 20:41:00 2025 +0300\
\
Ignore Xcode user data\
\
\cf14 commit 73b73f1d3f629249aa43ab73a19609d643858457\cf4 \
Author: Alice (RybakovaSA) <RybakovaSA@mpei.ru>\
Date: Sun Mar 30 20:37:18 2025 +0300\
\
code: \uc0\u1088 \u1072 \u1079 \u1085 \u1086 \u1089 \u1090 \u1100 \u1040 \u1080 \u1042 \
\
\cf14 commit 551b8a3a305f96af27fd2fd095c5e03e005280d2\cf4 \
Author: Alice (RybakovaSA) <RybakovaSA@mpei.ru>\
Date: Sun Mar 30 20:35:03 2025 +0300\
\
code: \uc0\u1089 \u1091 \u1084 \u1084 \u1072 \u1040 \u1080 \u1042 \
\
\cf14 commit 8388df181b85cf2b81b9e82ea2d9653a01ea4464\cf4 \
Author: Alice (RybakovaSA) <RybakovaSA@mpei.ru>\
Date: Sun Mar 30 20:28:16 2025 +0300\
\
build: \uc0\u1076 \u1086 \u1073 \u1072 \u1074 \u1083 \u1077 \u1085 \u1092 \u1072 \u1081 \u1083 \u1087 \u1088 \u1086 \u1077 \u1082 \u1090 \u1072 \
\
14.\cf2 \cb7 \expnd0\expndtw0\kerning0
\CocoaLigature1 \uc0\u1087 \u1088 \u1077 \u1076 \u1087 \u1086 \u1089 \u1083 \u1077 \u1076 \u1085 \u1080 \u1081 \u1082 \u1086 \u1084 \u1084 \u1080 \u1090 \cf4 \cb1 \kerning1\expnd0\expndtw0 \CocoaLigature0 \
\
svetlanarybakova@MacBook-Pro-Svetlana project % git show HEAD~1\
\cf14 commit b4c965edba5eba8235e0330fd840c79e2728320b\cf4 \
Author: Alice (RybakovaSA) <RybakovaSA@mpei.ru>\
Date: Sun Mar 30 20:41:00 2025 +0300\
\
Ignore Xcode user data\
\
\f1\b diff --git a/project.xcodeproj/project.xcworkspace/xcuserdata/svetlanarybakova.xcuserdatad/UserInterfaceState.xcuserstate b/project.xcodeproj/project.xcworkspace/xcuserdata/svetlanarybakova.xcuserdatad/UserInterfaceState.xcuserstate
\f0\b0 \
\f1\b deleted file mode 100644
\f0\b0 \
\f1\b index 4f647e4..0000000
\f0\b0 \
Binary files a/project.xcodeproj/project.xcworkspace/xcuserdata/svetlanarybakova.xcuserdatad/UserInterfaceState.xcuserstate and /dev/null differ\
\f1\b diff --git a/project.xcodeproj/project.xcworkspace/xcuserdata/svetlanarybakova.xcuserdatad/WorkspaceSettings.xcsettings b/project.xcodeproj/project.xcworkspace/xcuserdata/svetlanarybakova.xcuserdatad/WorkspaceSettings.xcsettings
\f0\b0 \
\f1\b deleted file mode 100644
\f0\b0 \
\f1\b index b4f210d..0000000
\f0\b0 \
\f1\b --- a/project.xcodeproj/project.xcworkspace/xcuserdata/svetlanarybakova.xcuserdatad/WorkspaceSettings.xcsettings
\f0\b0 \
\f1\b +++ /dev/null
\f0\b0 \
\cf15 @@ -1,16 +0,0 @@\cf4 \
\cf8 -<?xml version="1.0" encoding="UTF-8"?>\
\
\cf2 15\cb7 .
\f1\b \expnd0\expndtw0\kerning0
\CocoaLigature1 \uc0\u1055 \u1088 \u1086 \u1089 \u1084 \u1086 \u1090 \u1088 \u1080 \u1079 \u1084 \u1077 \u1085 \u1077 \u1085 \u1080 \u1081
\f0\b0 \kerning1\expnd0\expndtw0 \CocoaLigature0 \
\cf4 \cb1 \
svetlanarybakova@MacBook-Pro-Svetlana project % git diff\
\
\f1\b diff --git a/main.cpp b/main.cpp
\f0\b0 \
\f1\b index f5ce34a..abbaa76 100644
\f0\b0 \
\f1\b --- a/main.cpp
\f0\b0 \
\f1\b +++ b/main.cpp
\f0\b0 \
\cf15 @@ -5,6 +5,7 @@\cf4 int main() \{\
int a, b;\
cin >> a >> b;\
cout << "A + B = " << a + b << '\\n'\
\cf8 - << "A - B = " << a - b << '\\n';\cf4 \
\cf16 + << "A - B = " << a - b << '\\n'\cf4 \
\cf16 + << "A * B = " << a * b << '\\n';\cf4 \
return 0;\
\}\
(
\f1\b \cf0 \expnd0\expndtw0\kerning0
\CocoaLigature1 \uc0\u1056 \u1072 \u1079 \u1073 \u1086 \u1088 \u1089 \u1090 \u1088 \u1086 \u1082 \u1087 \u1072 \u1090 \u1095 \u1072 :\
\pard\tx220\tx720\pardeftab720\li720\fi-720\sa240\partightenfactor0
\ls2\ilvl0
\f0\b0 \cf0 diff --git a/main.cpp b/main.cpp \'97 \uc0\u1087 \u1086 \u1082 \u1072 \u1079 \u1099 \u1074 \u1072 \u1077 \u1090 , \u1095 \u1090 \u1086 \u1092 \u1072 \u1081 \u1083 main.cpp \u1080 \u1079 \u1084 \u1077 \u1085 \u1077 \u1085 .\
index f5ce34a..abbaa76 100644 \'97 \uc0\u1080 \u1085 \u1076 \u1077 \u1082 \u1089 \u1099 \u1080 \u1079 \u1084 \u1077 \u1085 \u1077 \u1085 \u1080 \u1081 \u1080 \u1087 \u1088 \u1072 \u1074 \u1072 \u1076 \u1086 \u1089 \u1090 \u1091 \u1087 \u1072 \u1082 \u1092 \u1072 \u1081 \u1083 \u1091 .\
--- a/main.cpp \'97 \uc0\u1089 \u1090 \u1072 \u1088 \u1072 \u1103 \u1074 \u1077 \u1088 \u1089 \u1080 \u1103 \u1092 \u1072 \u1081 \u1083 \u1072 .\
+++ b/main.cpp \'97 \uc0\u1085 \u1086 \u1074 \u1072 \u1103 \u1074 \u1077 \u1088 \u1089 \u1080 \u1103 \u1092 \u1072 \u1081 \u1083 \u1072 .\
@@ -5,6 +5,7 @@ \'97 \uc0\u1082 \u1086 \u1085 \u1090 \u1077 \u1082 \u1089 \u1090 \u1080 \u1079 \u1084 \u1077 \u1085 \u1077 \u1085 \u1080 \u1081 :\
\pard\tx940\tx1440\pardeftab720\li1440\fi-1440\sa240\partightenfactor0
\ls2\ilvl1\cf0 -5,6 \uc0\u1086 \u1079 \u1085 \u1072 \u1095 \u1072 \u1077 \u1090 , \u1095 \u1090 \u1086 \u1089 \u1090 \u1072 \u1088 \u1099 \u1081 \u1082 \u1086 \u1076 \u1079 \u1072 \u1090 \u1088 \u1072 \u1075 \u1080 \u1074 \u1072 \u1077 \u1090 \u1089 \u1090 \u1088 \u1086 \u1082 \u1080 5-6.\
+5,7 \uc0\u1091 \u1082 \u1072 \u1079 \u1099 \u1074 \u1072 \u1077 \u1090 , \u1095 \u1090 \u1086 \u1085 \u1086 \u1074 \u1099 \u1081 \u1082 \u1086 \u1076 \u1089 \u1086 \u1076 \u1077 \u1088 \u1078 \u1080 \u1090 \u1089 \u1090 \u1088 \u1086 \u1082 \u1080 5-7.\
\pard\tx220\tx720\pardeftab720\li720\fi-720\sa240\partightenfactor0
\ls2\ilvl0\cf0 - \uc0\u1087 \u1077 \u1088 \u1077 \u1076 \u1089 \u1090 \u1088 \u1086 \u1082 \u1086 \u1081 \u1087 \u1086 \u1082 \u1072 \u1079 \u1099 \u1074 \u1072 \u1077 \u1090 \u1091 \u1076 \u1072 \u1083 \u1077 \u1085 \u1080 \u1077 \u1082 \u1086 \u1076 \u1072 .\
+ \uc0\u1087 \u1077 \u1088 \u1077 \u1076 \u1089 \u1090 \u1088 \u1086 \u1082 \u1086 \u1081 \u1087 \u1086 \u1082 \u1072 \u1079 \u1099 \u1074 \u1072 \u1077 \u1090 \u1076 \u1086 \u1073 \u1072 \u1074 \u1083 \u1077 \u1085 \u1085 \u1099 \u1081 \u1082 \u1086 \u1076 .\cf4 \kerning1\expnd0\expndtw0 \CocoaLigature0 )\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardeftab720\pardirnatural\partightenfactor0
svetlanarybakova@MacBook-Pro-Svetlana project % git diff 0fcaee1 73b73f1\
\
\f1\b diff --git a/main.cpp b/main.cpp
\f0\b0 \
\f1\b index 346e589..f5ce34a 100644
\f0\b0 \
\f1\b --- a/main.cpp
\f0\b0 \
\f1\b +++ b/main.cpp
\f0\b0 \
\cf15 @@ -1,14 +1,10 @@\cf4 \
\cf8 -//\cf4 \
\cf8 -// main.cpp\cf4 \
\cf8 -// project\cf4 \
\cf8 -//\cf4 \
\cf8 -// Created by \uc0\u1057 \u1074 \u1077 \u1090 \u1083 \u1072 \u1085 \u1072 \u1056 \u1099 \u1073 \u1072 \u1082 \u1086 \u1074 \u1072 on 30.03.2025.\cf4 \
\cf8 -//\cf4 \
\cf8 -\cf4 \
#include <iostream>\
\
\cf8 -int main(int argc, const char * argv[]) \{\cf4 \
\cf8 - // insert code here...\cf4 \
\cf8 - std::cout << "Hello, World!\\n";\cf4 \
\cf16 +int main() \{\cf4 \
\cf16 + cout << "Enter A and B: ";\cf4 \
\cf16 + int a, b;\cf4 \
\cf16 + cin >> a >> b;\cf4 \
\cf16 + cout << "A + B = " << a + b << '\\n'\cf4 \
\cf16 + << "A - B = " << a - b << '\\n';\
\cf2 \
\
16. \uc0\u1050 \u1086 \u1084 \u1084 \u1080 \u1090 main.cpp, \u1087 \u1088 \u1086 \u1080 \u1079 \u1074 \u1077 \u1076 \u1077 \u1085 \u1080 \u1077 \cf4 \uc0\u1040 \u1080 \u1042 \
\
svetlanarybakova@MacBook-Pro-Svetlana project % git add main.cpp\
svetlanarybakova@MacBook-Pro-Svetlana project % git commit -m 'code: \uc0\u1087 \u1088 \u1086 \u1080 \u1079 \u1074 \u1077 \u1076 \u1077 \u1085 \u1080 \u1077 \u1040 \u1080 \u1042 '\
\
[main 94c1886] code: \uc0\u1087 \u1088 \u1086 \u1080 \u1079 \u1074 \u1077 \u1076 \u1077 \u1085 \u1080 \u1077 \u1040 \u1080 \u1042 \
1 file changed, 2 insertions(+), 1 deletion(-)\
\
1\cf2 \cb7 7\cb3 .
\f1\b \expnd0\expndtw0\kerning0
\CocoaLigature1 \uc0\u1054 \u1090 \u1082 \u1072 \u1090 \u1080 \u1079 \u1084 \u1077 \u1085 \u1077 \u1085 \u1080 \u1081
\f0\b0 \cb1 \kerning1\expnd0\expndtw0 \CocoaLigature0 \
\cf4 \
svetlanarybakova@MacBook-Pro-Svetlana project % git reset --hard HEAD~1\
\
HEAD is now at 0f5bfc9 git: \uc0\u1089 \u1086 \u1079 \u1076 \u1072 \u1085 .gitignore\
\
18. \uc0\u1057 \u1086 \u1079 \u1076 \u1072 \u1085 \u1080 \u1077 \'ab\u1082 \u1083 \u1102 \u1095 \u1077 \u1081 \cf2 \cb7 \'bb
\f1\b \expnd0\expndtw0\kerning0
\CocoaLigature1 SSH
\f0\b0 \cf4 \cb1 \kerning1\expnd0\expndtw0 \CocoaLigature0 \
\
svetlanarybakova@MacBook-Pro-Svetlana project % ssh-keygen\
\
Generating public/private ed25519 key pair.\
Enter file in which to save the key (/Users/svetlanarybakova/.ssh/id_ed25519): \
/Users/svetlanarybakova/.ssh/id_ed25519 already exists.\
Overwrite (y/n)? yes\
Enter passphrase (empty for no passphrase): \
Enter same passphrase again: \
Your identification has been saved in /Users/svetlanarybakova/.ssh/id_ed25519\
Your public key has been saved in /Users/svetlanarybakova/.ssh/id_ed25519.pub\
The key fingerprint is:\
SHA256:D4kljcUds+FXpJjgwo4r48xVV5WDJEUcLR0OajWi9uw svetlanarybakova@MacBook-Pro-Svetlana.local\
The key's randomart image is:\
+--[ED25519 256]--+\
| .=*%*o+o |\
| . *.B=@=o |\
| B * *.+. |\
| + O o . |\
| . + S |\
| o o o |\
| o o E . |\
| + + |\
| + |\
+----[SHA256]-----+\
svetlanarybakova@MacBook-Pro-Svetlana project % eval $(ssh-agent -s)\
\
Agent pid 1462\
\
svetlanarybakova@MacBook-Pro-Svetlana project % ssh-add\
\
Enter passphrase for /Users/svetlanarybakova/.ssh/id_ed25519: \
Identity added: /Users/svetlanarybakova/.ssh/id_ed25519 (svetlanarybakova@MacBook-Pro-Svetlana.local)\
svetlanarybakova@MacBook-Pro-Svetlana project % cat ~/.ssh/id_ed25519.pub\
\
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDiE8nbWPjtxSECTnlj3ZOOpGBFtFEm3pkV7XsmZssjZ svetlanarybakova@MacBook-Pro-Svetlana.local\
\
Enter passphrase for /Users/svetlanarybakova/.ssh/id_ed25519: \
Identity added: /Users/svetlanarybakova/.ssh/id_ed25519 (svetlanarybakova@MacBook-Pro-Svetlana.local)\
\
\cf2 \cb7 19.
\f1\b \expnd0\expndtw0\kerning0
\CocoaLigature1 \uc0\u1054 \u1090 \u1087 \u1088 \u1072 \u1074 \u1082 \u1072 \u1087 \u1088 \u1086 \u1077 \u1082 \u1090 \u1072 \u1085 \u1072 \'a0\u1089 \u1077 \u1088 \u1074 \u1077 \u1088
\f0\b0 \cf4 \cb1 \kerning1\expnd0\expndtw0 \CocoaLigature0 \
\
svetlanarybakova@MacBook-Pro-Svetlana project % git remote add origin git@uit.mpei.ru:RybakovaSA/cs-lab02.git\
git push -u origin main\
Enumerating objects: 46, done.\
Counting objects: 100% (46/46), done.\
Delta compression using up to 11 threads\
Compressing objects: 100% (44/44), done.\
Writing objects: 100% (46/46), 22.46 KiB | 7.49 MiB/s, done.\
Total 46 (delta 8), reused 0 (delta 0), pack-reused 0\
remote: . Processing 1 references\
remote: Processed 1 references in total\
To uit.mpei.ru:RybakovaSA/cs-lab02.git\
* [new branch] main -> main\
branch 'main' set up to track 'origin/main'.\
\
svetlanarybakova@MacBook-Pro-Svetlana project % git remote -v\
origin git@uit.mpei.ru:RybakovaSA/cs-lab02.git (fetch)\
origin git@uit.mpei.ru:RybakovaSA/cs-lab02.git (push)\
\
20. \uc0\u1041 \u1086 \u1073 \u1087 \u1088 \u1080 \u1089 \u1086 \u1077 \u1076 \u1080 \u1085 \u1080 \u1083 \u1089 \u1103 \
\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardeftab720\pardirnatural\partightenfactor0
\fs22 svetlanarybakova@MacBook-Pro-Svetlana ~ % cd desktop\
svetlanarybakova@MacBook-Pro-Svetlana desktop % cd lab02\
svetlanarybakova@MacBook-Pro-Svetlana lab02 % cd bob\
svetlanarybakova@MacBook-Pro-Svetlana bob % git clone git@uit.mpei.ru:RybakovaSA/cs-lab02.git project\
\
Cloning into 'project'...\
Enter passphrase for key '/Users/svetlanarybakova/.ssh/id_ed25519': \
remote: Enumerating objects: 46, done.\
remote: Counting objects: 100% (46/46), done.\
remote: Compressing objects: 100% (44/44), done.\
remote: Total 46 (delta 8), reused 0 (delta 0), pack-reused 0\
Receiving objects: 100% (46/46), 22.46 KiB | 139.00 KiB/s, done.\
Resolving deltas: 100% (8/8), done.\
svetlanarybakova@MacBook-Pro-Svetlana bob % cd project\
\
svetlanarybakova@MacBook-Pro-Svetlana project % git config user.name 'Bob (RybakovaSA)' \
git config user.email 'bob@example.com'\
\
svetlanarybakova@MacBook-Pro-Svetlana project % cd ..\
svetlanarybakova@MacBook-Pro-Svetlana bob % cd project\
svetlanarybakova@MacBook-Pro-Svetlana project % git config user.name 'Bob (RybakovaSA)'\
git config user.email 'bob@example.com'\
\
21.
\fs24 \uc0\u1041 \u1086 \u1073 \cf2 \cb7 .
\f1\b \expnd0\expndtw0\kerning0
\CocoaLigature1 \uc0\u1057 \u1086 \u1074 \u1084 \u1077 \u1089 \u1090 \u1085 \u1072 \u1103 \u1088 \u1072 \u1073 \u1086 \u1090 \u1072 \u1085 \u1072 \u1076 \u1087 \u1088 \u1086 \u1077 \u1082 \u1090 \u1086 \u1084 \u1073 \u1077 \u1079 \u1082 \u1086 \u1085 \u1092 \u1083 \u1080 \u1082 \u1090 \u1086 \u1074 \u1087 \u1088 \u1072 \u1074 \u1086 \u1082 \
\
\f0\b0\fs22 \cf4 \cb1 \kerning1\expnd0\expndtw0 \CocoaLigature0 svetlanarybakova@MacBook-Pro-Svetlana project % git add main.cpp\
svetlanarybakova@MacBook-Pro-Svetlana project % git commit -m 'code: \uc0\u1087 \u1088 \u1086 \u1080 \u1079 \u1074 \u1077 \u1076 \u1077 \u1085 \u1080 \u1077 \u1040 \u1080 \u1042 '\
\
[main d221187] code: \uc0\u1087 \u1088 \u1086 \u1080 \u1079 \u1074 \u1077 \u1076 \u1077 \u1085 \u1080 \u1077 \u1040 \u1080 \u1042 \
1 file changed, 2 insertions(+), 1 deletion(-)\
svetlanarybakova@MacBook-Pro-Svetlana project % git log --oneline --decorate\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardeftab720\pardirnatural\partightenfactor0
\cf14 d221187 (
\f1\b \cf15 HEAD -> \cf16 main
\f0\b0 \cf14 )\cf4 code: \uc0\u1087 \u1088 \u1086 \u1080 \u1079 \u1074 \u1077 \u1076 \u1077 \u1085 \u1080 \u1077 \u1040 \u1080 \u1042 \
\cf14 0f5bfc9 (
\f1\b \cf8 origin/main
\f0\b0 \cf14 ,
\f1\b \cf8 origin/HEAD
\f0\b0 \cf14 )\cf4 git: \uc0\u1089 \u1086 \u1079 \u1076 \u1072 \u1085 .gitignore\
\cf14 b4c965e\cf4 Ignore Xcode user data\
\cf14 73b73f1\cf4 code: \uc0\u1088 \u1072 \u1079 \u1085 \u1086 \u1089 \u1090 \u1100 \u1040 \u1080 \u1042 \
\cf14 551b8a3\cf4 code: \uc0\u1089 \u1091 \u1084 \u1084 \u1072 \u1040 \u1080 \u1042 \
\cf14 a4ecbfa\cf4 code: \uc0\u1074 \u1099 \u1074 \u1086 \u1076 \u1040 \u1080 \u1042 \
\cf14 8388df1\cf4 build: \uc0\u1076 \u1086 \u1073 \u1072 \u1074 \u1083 \u1077 \u1085 \u1092 \u1072 \u1081 \u1083 \u1087 \u1088 \u1086 \u1077 \u1082 \u1090 \u1072 \
\cf14 0fcaee1\cf4 code: \uc0\u1079 \u1072 \u1075 \u1086 \u1090 \u1086 \u1074 \u1082 \u1072 \u1087 \u1088 \u1086 \u1075 \u1088 \u1072 \u1084 \u1084 \u1099 \
svetlanarybakova@MacBook-Pro-Svetlana project %
\f1\b git push
\f0\b0 \
\
Enter passphrase for key '/Users/svetlanarybakova/.ssh/id_ed25519': \
Enumerating objects: 5, done.\
Counting objects: 100% (5/5), done.\
Delta compression using up to 11 threads\
Compressing objects: 100% (3/3), done.\
Writing objects: 100% (3/3), 431 bytes | 431.00 KiB/s, done.\
Total 3 (delta 1), reused 0 (delta 0), pack-reused 0\
remote: . Processing 1 references\
remote: Processed 1 references in total\
To uit.mpei.ru:RybakovaSA/cs-lab02.git\
0f5bfc9..d221187 main -> main\
\
\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardeftab720\pardirnatural\partightenfactor0
\fs24 \
22. \uc0\u1054 \u1073 \u1088 \u1072 \u1090 \u1085 \u1086 \u1082 \u1040 \u1083 \u1080 \u1089 \u1077 \
\
svetlanarybakova@MacBook-Pro-Svetlana project % git log --oneline --decorate\
\cf14 0f5bfc9 (
\f1\b \cf15 HEAD -> \cf16 main
\f0\b0 \cf14 ,
\f1\b \cf8 origin/main
\f0\b0 \cf14 )\cf4 git: \uc0\u1089 \u1086 \u1079 \u1076 \u1072 \u1085 .gitignore\
\cf14 b4c965e\cf4 Ignore Xcode user data\
\cf14 73b73f1\cf4 code: \uc0\u1088 \u1072 \u1079 \u1085 \u1086 \u1089 \u1090 \u1100 \u1040 \u1080 \u1042 \
\cf14 551b8a3\cf4 code: \uc0\u1089 \u1091 \u1084 \u1084 \u1072 \u1040 \u1080 \u1042 \
\cf14 a4ecbfa\cf4 code: \uc0\u1074 \u1099 \u1074 \u1086 \u1076 \u1040 \u1080 \u1042 \
\cf14 8388df1\cf4 build: \uc0\u1076 \u1086 \u1073 \u1072 \u1074 \u1083 \u1077 \u1085 \u1092 \u1072 \u1081 \u1083 \u1087 \u1088 \u1086 \u1077 \u1082 \u1090 \u1072 \
\cf14 0fcaee1\cf4 code: \uc0\u1079 \u1072 \u1075 \u1086 \u1090 \u1086 \u1074 \u1082 \u1072 \u1087 \u1088 \u1086 \u1075 \u1088 \u1072 \u1084 \u1084 \u1099 \
\
\
svetlanarybakova@MacBook-Pro-Svetlana project % 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 1), reused 0 (delta 0), pack-reused 0\
Unpacking objects: 100% (3/3), 411 bytes | 137.00 KiB/s, done.\
From uit.mpei.ru:RybakovaSA/cs-lab02\
0f5bfc9..d221187 main -> origin/main\
svetlanarybakova@MacBook-Pro-Svetlana project % git log --oneline --decorate --all --graph\
\
* \cf14 d221187 (
\f1\b \cf8 origin/main
\f0\b0 \cf14 )\cf4 code: \uc0\u1087 \u1088 \u1086 \u1080 \u1079 \u1074 \u1077 \u1076 \u1077 \u1085 \u1080 \u1077 \u1040 \u1080 \u1042 \
* \cf14 0f5bfc9 (
\f1\b \cf15 HEAD -> \cf16 main
\f0\b0 \cf14 )\cf4 git: \uc0\u1089 \u1086 \u1079 \u1076 \u1072 \u1085 .gitignore\
* \cf14 b4c965e\cf4 Ignore Xcode user data\
* \cf14 73b73f1\cf4 code: \uc0\u1088 \u1072 \u1079 \u1085 \u1086 \u1089 \u1090 \u1100 \u1040 \u1080 \u1042 \
* \cf14 551b8a3\cf4 code: \uc0\u1089 \u1091 \u1084 \u1084 \u1072 \u1040 \u1080 \u1042 \
* \cf14 a4ecbfa\cf4 code: \uc0\u1074 \u1099 \u1074 \u1086 \u1076 \u1040 \u1080 \u1042 \
* \cf14 8388df1\cf4 build: \uc0\u1076 \u1086 \u1073 \u1072 \u1074 \u1083 \u1077 \u1085 \u1092 \u1072 \u1081 \u1083 \u1087 \u1088 \u1086 \u1077 \u1082 \u1090 \u1072 \
* \cf14 0fcaee1\cf4 code: \uc0\u1079 \u1072 \u1075 \u1086 \u1090 \u1086 \u1074 \u1082 \u1072 \u1087 \u1088 \u1086 \u1075 \u1088 \u1072 \u1084 \u1084 \u1099 \
\
svetlanarybakova@MacBook-Pro-Svetlana project % git pull --ff-only\
\
Updating 0f5bfc9..d221187\
Fast-forward\
main.cpp | 3 \cf16 ++\cf8 -\cf4 \
1 file changed, 2 insertions(+), 1 deletion(-)\
\
23.\uc0\u1040 \u1083 \u1080 \u1089 \u1072 . \u1044 \u1086 \u1073 \u1072 \u1074 \u1083 \u1077 \u1085 \u1080 \u1077 \u1076 \u1077 \u1083 \u1077 \u1085 \u1080 \u1103 \
\
svetlanarybakova@MacBook-Pro-Svetlana project % git add main.cpp\
svetlanarybakova@MacBook-Pro-Svetlana project % git commit -m 'code: \uc0\u1076 \u1077 \u1083 \u1077 \u1085 \u1080 \u1077 \u1040 \u1085 \u1072 \u1042 ' \
[main 30c5603] code: \uc0\u1076 \u1077 \u1083 \u1077 \u1085 \u1080 \u1077 \u1040 \u1085 \u1072 \u1042 \
1 file changed, 1 insertion(+)\
svetlanarybakova@MacBook-Pro-Svetlana project % git push\
Enumerating objects: 5, done.\
Counting objects: 100% (5/5), done.\
Delta compression using up to 11 threads\
Compressing objects: 100% (3/3), done.\
Writing objects: 100% (3/3), 402 bytes | 402.00 KiB/s, done.\
Total 3 (delta 1), reused 0 (delta 0), pack-reused 0\
remote: . Processing 1 references\
remote: Processed 1 references in total\
To uit.mpei.ru:RybakovaSA/cs-lab02.git\
d221187..30c5603 main -> main\
\
24. \uc0\u1041 \u1086 \u1073 \u1087 \u1088 \u1080 \u1085 \u1103 \u1083 \
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardeftab720\pardirnatural\partightenfactor0
\fs22 svetlanarybakova@MacBook-Pro-Svetlana project % git fetch\
\
Enter passphrase for key '/Users/svetlanarybakova/.ssh/id_ed25519': \
svetlanarybakova@MacBook-Pro-Svetlana project % git fetch\
Enter passphrase for key '/Users/svetlanarybakova/.ssh/id_ed25519': \
svetlanarybakova@MacBook-Pro-Svetlana project % git fetch\
Enter passphrase for key '/Users/svetlanarybakova/.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), 382 bytes | 127.00 KiB/s, done.\
From uit.mpei.ru:RybakovaSA/cs-lab02\
d221187..30c5603 main -> origin/main\
svetlanarybakova@MacBook-Pro-Svetlana project % git pull --ff-only\
\
Enter passphrase for key '/Users/svetlanarybakova/.ssh/id_ed25519': \
Updating d221187..30c5603\
Fast-forward\
main.cpp | 1 \cf16 +\cf4 \
1 file changed, 1 insertion(+)\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardeftab720\pardirnatural\partightenfactor0
\fs24 25. \uc0\u1059 \u1076 \u1072 \u1083 \u1080 \u1084 \u1083 \u1080 \u1096 \u1085 \u1080 \u1081 \u1079 \u1085 \u1072 \u1082 \u1095 \u1077 \u1088 \u1077 \u1079 \u1040 \u1083 \u1080 \u1089 \u1091 \u1080 \u1089 \u1086 \u1093 \u1088 \u1072 \u1085 \u1080 \u1084 \u1091 \u1073 \u1086 \u1073 \u1072 \
svetlanarybakova@MacBook-Pro-Svetlana project % git add main.cpp\
svetlanarybakova@MacBook-Pro-Svetlana project % git commit -m 'code: \uc0\u1091 \u1076 \u1072 \u1083 \u1077 \u1085 \u1080 \u1077 \u1079 \u1085 \u1072 \u1082 \u1072 '\
[main 87fc9e8] code: \uc0\u1091 \u1076 \u1072 \u1083 \u1077 \u1085 \u1080 \u1077 \u1079 \u1085 \u1072 \u1082 \u1072 \
1 file changed, 1 insertion(+), 1 deletion(-)\
svetlanarybakova@MacBook-Pro-Svetlana project % git push\
Enumerating objects: 5, done.\
Counting objects: 100% (5/5), done.\
Delta compression using up to 11 threads\
Compressing objects: 100% (3/3), done.\
Writing objects: 100% (3/3), 388 bytes | 388.00 KiB/s, done.\
Total 3 (delta 1), reused 0 (delta 0), pack-reused 0\
remote: . Processing 1 references\
remote: Processed 1 references in total\
To uit.mpei.ru:RybakovaSA/cs-lab02.git\
30c5603..87fc9e8 main -> main\
\
\uc0\u1041 \u1086 \u1073 \u1087 \u1088 \u1080 \u1085 \u1080 \u1084 \u1072 \u1077 \u1090 \
\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardeftab720\pardirnatural\partightenfactor0
\fs22 svetlanarybakova@MacBook-Pro-Svetlana project % git fetch\
Enter passphrase for key '/Users/svetlanarybakova/.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), 368 bytes | 73.00 KiB/s, done.\
From uit.mpei.ru:RybakovaSA/cs-lab02\
30c5603..87fc9e8 main -> origin/main\
svetlanarybakova@MacBook-Pro-Svetlana project % git pull --ff-only\
Enter passphrase for key '/Users/svetlanarybakova/.ssh/id_ed25519': \
Updating 30c5603..87fc9e8\
Fast-forward\
main.cpp | 2 \cf16 +\cf8 -\cf4 \
1 file changed, 1 insertion(+), 1 deletion(-)
\fs24 \
\
26. \uc0\u1040 \u1083 \u1080 \u1089 \u1072 \u1076 \u1086 \u1073 \u1072 \u1074 \u1083 \u1103 \u1077 \u1090 \u1084 \u1072 \u1082 \u1089 \u1080 \u1084 \u1091 \u1084 \
svetlanarybakova@MacBook-Pro-Svetlana project % git add main.cpp\
svetlanarybakova@MacBook-Pro-Svetlana project % git commit -m 'code: max \uc0\u1040 \u1080 \u1042 ' \
[main 049d89c] code: max \uc0\u1040 \u1080 \u1042 \
1 file changed, 2 insertions(+), 1 deletion(-)\
svetlanarybakova@MacBook-Pro-Svetlana project % git push\
Enumerating objects: 5, done.\
Counting objects: 100% (5/5), done.\
Delta compression using up to 11 threads\
Compressing objects: 100% (3/3), done.\
Writing objects: 100% (3/3), 416 bytes | 416.00 KiB/s, done.\
Total 3 (delta 1), reused 0 (delta 0), pack-reused 0\
remote: . Processing 1 references\
remote: Processed 1 references in total\
To uit.mpei.ru:RybakovaSA/cs-lab02.git\
87fc9e8..049d89c main -> main\
\
27. \uc0\u1041 \u1086 \u1073 \u1076 \u1086 \u1073 \u1072 \u1074 \u1083 \u1103 \u1077 \u1090 \u1084 \u1080 \u1085 \u1080 \u1084 \u1091 \u1084 \
\
\fs22 svetlanarybakova@MacBook-Pro-Svetlana project % git add main.cpp\
svetlanarybakova@MacBook-Pro-Svetlana project % git commit -m 'code: min \uc0\u1040 \u1080 \u1042 '\
\
[main 65c1486] code: min \uc0\u1040 \u1080 \u1042 \
1 file changed, 2 insertions(+), 1 deletion(-)\
svetlanarybakova@MacBook-Pro-Svetlana project % git push\
Enter passphrase for key '/Users/svetlanarybakova/.ssh/id_ed25519': \
To uit.mpei.ru:RybakovaSA/cs-lab02.git\
\cf8 ! [rejected] \cf4 main -> main (fetch first)\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardeftab720\pardirnatural\partightenfactor0
\cf8 error: failed to push some refs to 'uit.mpei.ru:RybakovaSA/cs-lab02.git'\cf4 \
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardeftab720\pardirnatural\partightenfactor0
\cf14 hint: Updates were rejected because the remote contains work that you do\cf4 \
\cf14 hint: not have locally. This is usually caused by another repository pushing\cf4 \
\cf14 hint: to the same ref. You may want to first integrate the remote changes\cf4 \
\cf14 hint: (e.g., 'git pull ...') before pushing again.\cf4 \
\cf14 hint: See the 'Note about fast-forwards' in 'git push --help' for details.\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardeftab720\pardirnatural\partightenfactor0
\cf4 svetlanarybakova@MacBook-Pro-Svetlana project % git pull --ff-only\
\
Enter passphrase for key '/Users/svetlanarybakova/.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), 396 bytes | 99.00 KiB/s, done.\
From uit.mpei.ru:RybakovaSA/cs-lab02\
87fc9e8..049d89c main -> origin/main\
fatal: Not possible to fast-forward, aborting.\
svetlanarybakova@MacBook-Pro-Svetlana project % git log --oneline --graph --all\
\
* \cf14 65c1486 (
\f1\b \cf15 HEAD -> \cf16 main
\f0\b0 \cf14 )\cf4 code: min \uc0\u1040 \u1080 \u1042 \
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardeftab720\pardirnatural\partightenfactor0
\cf8 |\cf4 * \cf14 049d89c (
\f1\b \cf8 origin/main
\f0\b0 \cf14 ,
\f1\b \cf8 origin/HEAD
\f0\b0 \cf14 )\cf4 code: max \uc0\u1040 \u1080 \u1042 \
\cf8 |/\cf4 \
* \cf14 87fc9e8\cf4 code: \uc0\u1091 \u1076 \u1072 \u1083 \u1077 \u1085 \u1080 \u1077 \u1079 \u1085 \u1072 \u1082 \u1072 \
* \cf14 30c5603\cf4 code: \uc0\u1076 \u1077 \u1083 \u1077 \u1085 \u1080 \u1077 \u1040 \u1085 \u1072 \u1042 \
* \cf14 d221187\cf4 code: \uc0\u1087 \u1088 \u1086 \u1080 \u1079 \u1074 \u1077 \u1076 \u1077 \u1085 \u1080 \u1077 \u1040 \u1080 \u1042 \
* \cf14 0f5bfc9\cf4 git: \uc0\u1089 \u1086 \u1079 \u1076 \u1072 \u1085 .gitignore\
* \cf14 b4c965e\cf4 Ignore Xcode user data\
* \cf14 73b73f1\cf4 code: \uc0\u1088 \u1072 \u1079 \u1085 \u1086 \u1089 \u1090 \u1100 \u1040 \u1080 \u1042 \
* \cf14 551b8a3\cf4 code: \uc0\u1089 \u1091 \u1084 \u1084 \u1072 \u1040 \u1080 \u1042 \
* \cf14 a4ecbfa\cf4 code: \uc0\u1074 \u1099 \u1074 \u1086 \u1076 \u1040 \u1080 \u1042 \
* \cf14 8388df1\cf4 build: \uc0\u1076 \u1086 \u1073 \u1072 \u1074 \u1083 \u1077 \u1085 \u1092 \u1072 \u1081 \u1083 \u1087 \u1088 \u1086 \u1077 \u1082 \u1090 \u1072 \
* \cf14 0fcaee1\cf4 code: \uc0\u1079 \u1072 \u1075 \u1086 \u1090 \u1086 \u1074 \u1082 \u1072 \u1087 \u1088 \u1086 \u1075 \u1088 \u1072 \u1084 \u1084 \u1099
\fs24 \
\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardeftab720\pardirnatural\partightenfactor0
\fs22 svetlanarybakova@MacBook-Pro-Svetlana project % git rebase origin/main\
\
Auto-merging main.cpp\
CONFLICT (content): Merge conflict in main.cpp\
error: could not apply 65c1486... code: min \uc0\u1040 \u1080 \u1042 \
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardeftab720\pardirnatural\partightenfactor0
\cf14 hint: Resolve all conflicts manually, mark them as resolved with\cf4 \
\cf14 hint: "git add/rm <conflicted_files>", then run "git rebase --continue".\cf4 \
\cf14 hint: You can instead skip this commit: run "git rebase --skip".\cf4 \
\cf14 hint: To abort and get back to the state before "git rebase", run "git rebase --abort".\cf4 \
Could not apply 65c1486... code: min \uc0\u1040 \u1080 \u1042 \
svetlanarybakova@MacBook-Pro-Svetlana project % git status\
\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardeftab720\pardirnatural\partightenfactor0
\cf8 interactive rebase in progress; onto \cf4 049d89c\
Last command done (1 command done):\
pick 65c1486 code: min \uc0\u1040 \u1080 \u1042 \
No commands remaining.\
You are currently rebasing branch 'main' on '049d89c'.\
(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)\
\cf8 both modified: main.cpp\cf4 \
\
no changes added to commit (use "git add" and/or "git commit -a")\
svetlanarybakova@MacBook-Pro-Svetlana project % git add main.cpp\
\
svetlanarybakova@MacBook-Pro-Svetlana project % git rebase --continue\
[detached HEAD f00b798] code: min \uc0\u1040 \u1080 \u1042 \
1 file changed, 2 insertions(+), 1 deletion(-)\
Successfully rebased and updated refs/heads/main.\
svetlanarybakova@MacBook-Pro-Svetlana project % git log --oneline --graph --all\
\
* \cf14 f00b798 (
\f1\b \cf15 HEAD -> \cf16 main
\f0\b0 \cf14 )\cf4 code: min \uc0\u1040 \u1080 \u1042 \
* \cf14 049d89c (
\f1\b \cf8 origin/main
\f0\b0 \cf14 ,
\f1\b \cf8 origin/HEAD
\f0\b0 \cf14 )\cf4 code: max \uc0\u1040 \u1080 \u1042 \
* \cf14 87fc9e8\cf4 code: \uc0\u1091 \u1076 \u1072 \u1083 \u1077 \u1085 \u1080 \u1077 \u1079 \u1085 \u1072 \u1082 \u1072 \
* \cf14 30c5603\cf4 code: \uc0\u1076 \u1077 \u1083 \u1077 \u1085 \u1080 \u1077 \u1040 \u1085 \u1072 \u1042 \
* \cf14 d221187\cf4 code: \uc0\u1087 \u1088 \u1086 \u1080 \u1079 \u1074 \u1077 \u1076 \u1077 \u1085 \u1080 \u1077 \u1040 \u1080 \u1042 \
* \cf14 0f5bfc9\cf4 git: \uc0\u1089 \u1086 \u1079 \u1076 \u1072 \u1085 .gitignore\
* \cf14 b4c965e\cf4 Ignore Xcode user data\
* \cf14 73b73f1\cf4 code: \uc0\u1088 \u1072 \u1079 \u1085 \u1086 \u1089 \u1090 \u1100 \u1040 \u1080 \u1042 \
* \cf14 551b8a3\cf4 code: \uc0\u1089 \u1091 \u1084 \u1084 \u1072 \u1040 \u1080 \u1042 \
* \cf14 a4ecbfa\cf4 code: \uc0\u1074 \u1099 \u1074 \u1086 \u1076 \u1040 \u1080 \u1042 \
* \cf14 8388df1\cf4 build: \uc0\u1076 \u1086 \u1073 \u1072 \u1074 \u1083 \u1077 \u1085 \u1092 \u1072 \u1081 \u1083 \u1087 \u1088 \u1086 \u1077 \u1082 \u1090 \u1072 \
* \cf14 0fcaee1\cf4 code: \uc0\u1079 \u1072 \u1075 \u1086 \u1090 \u1086 \u1074 \u1082 \u1072 \u1087 \u1088 \u1086 \u1075 \u1088 \u1072 \u1084 \u1084 \u1099 \
\
svetlanarybakova@MacBook-Pro-Svetlana project % git push \
Enter passphrase for key '/Users/svetlanarybakova/.ssh/id_ed25519': \
Enumerating objects: 5, done.\
Counting objects: 100% (5/5), done.\
Delta compression using up to 11 threads\
Compressing objects: 100% (3/3), done.\
Writing objects: 100% (3/3), 394 bytes | 394.00 KiB/s, done.\
Total 3 (delta 1), reused 0 (delta 0), pack-reused 0\
remote: . Processing 1 references\
remote: Processed 1 references in total\
To uit.mpei.ru:RybakovaSA/cs-lab02.git\
049d89c..f00b798 main -> main\
svetlanarybakova@MacBook-Pro-Svetlana project % git log --oneline --graph --all \
* \cf14 f00b798 (
\f1\b \cf15 HEAD -> \cf16 main
\f0\b0 \cf14 ,
\f1\b \cf8 origin/main
\f0\b0 \cf14 ,
\f1\b \cf8 origin/HEAD
\f0\b0 \cf14 )\cf4 code: min \uc0\u1040 \u1080 \u1042 \
* \cf14 049d89c\cf4 code: max \uc0\u1040 \u1080 \u1042 \
* \cf14 87fc9e8\cf4 code: \uc0\u1091 \u1076 \u1072 \u1083 \u1077 \u1085 \u1080 \u1077 \u1079 \u1085 \u1072 \u1082 \u1072 \
* \cf14 30c5603\cf4 code: \uc0\u1076 \u1077 \u1083 \u1077 \u1085 \u1080 \u1077 \u1040 \u1085 \u1072 \u1042 \
* \cf14 d221187\cf4 code: \uc0\u1087 \u1088 \u1086 \u1080 \u1079 \u1074 \u1077 \u1076 \u1077 \u1085 \u1080 \u1077 \u1040 \u1080 \u1042 \
* \cf14 0f5bfc9\cf4 git: \uc0\u1089 \u1086 \u1079 \u1076 \u1072 \u1085 .gitignore\
* \cf14 b4c965e\cf4 Ignore Xcode user data\
* \cf14 73b73f1\cf4 code: \uc0\u1088 \u1072 \u1079 \u1085 \u1086 \u1089 \u1090 \u1100 \u1040 \u1080 \u1042 \
* \cf14 551b8a3\cf4 code: \uc0\u1089 \u1091 \u1084 \u1084 \u1072 \u1040 \u1080 \u1042 \
* \cf14 a4ecbfa\cf4 code: \uc0\u1074 \u1099 \u1074 \u1086 \u1076 \u1040 \u1080 \u1042 \
* \cf14 8388df1\cf4 build: \uc0\u1076 \u1086 \u1073 \u1072 \u1074 \u1083 \u1077 \u1085 \u1092 \u1072 \u1081 \u1083 \u1087 \u1088 \u1086 \u1077 \u1082 \u1090 \u1072 \
* \cf14 0fcaee1\cf4 code: \uc0\u1079 \u1072 \u1075 \u1086 \u1090 \u1086 \u1074 \u1082 \u1072 \u1087 \u1088 \u1086 \u1075 \u1088 \u1072 \u1084 \u1084 \u1099 \
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardeftab720\pardirnatural\partightenfactor0
\fs24 \
28.
\f1\b \cf2 \cb7 \expnd0\expndtw0\kerning0
\CocoaLigature1 \uc0\u1048 \u1089 \u1087 \u1086 \u1083 \u1100 \u1079 \u1086 \u1074 \u1072 \u1085 \u1080 \u1077 \u1074 \u1077 \u1090 \u1086 \u1082
\f3\fs48 \cf6 \
\f0\b0\fs24 \cf2 \kerning1\expnd0\expndtw0 \CocoaLigature0 \
\cf4 \cb1 svetlanarybakova@MacBook-Pro-Svetlana project % git branch double\
\
svetlanarybakova@MacBook-Pro-Svetlana project % git checkout double\
\
Switched to branch 'double'\
svetlanarybakova@MacBook-Pro-Svetlana project % git add main.cpp\
svetlanarybakova@MacBook-Pro-Svetlana project % git commit -m 'code: \uc0\u1080 \u1079 \u1084 \u1077 \u1085 \u1077 \u1085 \u1080 \u1077 \u1090 \u1080 \u1087 \u1072 \u1085 \u1072 double' \
[double 9d5c69f] code: \uc0\u1080 \u1079 \u1084 \u1077 \u1085 \u1077 \u1085 \u1080 \u1077 \u1090 \u1080 \u1087 \u1072 \u1085 \u1072 double\
1 file changed, 1 insertion(+), 1 deletion(-)\
svetlanarybakova@MacBook-Pro-Svetlana project % git checkout main\
\
Switched to branch 'main'\
Your branch is up to date with 'origin/main'.\
svetlanarybakova@MacBook-Pro-Svetlana project % git status\
git log --oneline --graph --all\
\
On branch main\
Your branch is up to date with 'origin/main'.\
\
nothing to commit, working tree clean\
* \cf14 9d5c69f (
\f1\b \cf16 double
\f0\b0 \cf14 )\cf4 code: \uc0\u1080 \u1079 \u1084 \u1077 \u1085 \u1077 \u1085 \u1080 \u1077 \u1090 \u1080 \u1087 \u1072 \u1085 \u1072 double\
* \cf14 049d89c (
\f1\b \cf15 HEAD -> \cf16 main
\f0\b0 \cf14 ,
\f1\b \cf8 origin/main
\f0\b0 \cf14 )\cf4 code: max \uc0\u1040 \u1080 \u1042 \
* \cf14 87fc9e8\cf4 code: \uc0\u1091 \u1076 \u1072 \u1083 \u1077 \u1085 \u1080 \u1077 \u1079 \u1085 \u1072 \u1082 \u1072 \
* \cf14 30c5603\cf4 code: \uc0\u1076 \u1077 \u1083 \u1077 \u1085 \u1080 \u1077 \u1040 \u1085 \u1072 \u1042 \
* \cf14 d221187\cf4 code: \uc0\u1087 \u1088 \u1086 \u1080 \u1079 \u1074 \u1077 \u1076 \u1077 \u1085 \u1080 \u1077 \u1040 \u1080 \u1042 \
* \cf14 0f5bfc9\cf4 git: \uc0\u1089 \u1086 \u1079 \u1076 \u1072 \u1085 .gitignore\
* \cf14 b4c965e\cf4 Ignore Xcode user data\
* \cf14 73b73f1\cf4 code: \uc0\u1088 \u1072 \u1079 \u1085 \u1086 \u1089 \u1090 \u1100 \u1040 \u1080 \u1042 \
* \cf14 551b8a3\cf4 code: \uc0\u1089 \u1091 \u1084 \u1084 \u1072 \u1040 \u1080 \u1042 \
* \cf14 a4ecbfa\cf4 code: \uc0\u1074 \u1099 \u1074 \u1086 \u1076 \u1040 \u1080 \u1042 \
* \cf14 8388df1\cf4 build: \uc0\u1076 \u1086 \u1073 \u1072 \u1074 \u1083 \u1077 \u1085 \u1092 \u1072 \u1081 \u1083 \u1087 \u1088 \u1086 \u1077 \u1082 \u1090 \u1072 \
* \cf14 0fcaee1\cf4 code: \uc0\u1079 \u1072 \u1075 \u1086 \u1090 \u1086 \u1074 \u1082 \u1072 \u1087 \u1088 \u1086 \u1075 \u1088 \u1072 \u1084 \u1084 \u1099 \
\
\
svetlanarybakova@MacBook-Pro-Svetlana project % git pull --ff-only\
\
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), 374 bytes | 124.00 KiB/s, done.\
From uit.mpei.ru:RybakovaSA/cs-lab02\
049d89c..f00b798 main -> origin/main\
Updating 049d89c..f00b798\
Fast-forward\
main.cpp | 3 \cf16 ++\cf8 -\cf4 \
1 file changed, 2 insertions(+), 1 deletion(-)\
\
svetlanarybakova@MacBook-Pro-Svetlana project % git log --oneline --graph --all\
* \cf14 9d5c69f (
\f1\b \cf16 double
\f0\b0 \cf14 )\cf4 code: \uc0\u1080 \u1079 \u1084 \u1077 \u1085 \u1077 \u1085 \u1080 \u1077 \u1090 \u1080 \u1087 \u1072 \u1085 \u1072 double\
\cf8 |\cf4 * \cf14 f00b798 (
\f1\b \cf15 HEAD -> \cf16 main
\f0\b0 \cf14 ,
\f1\b \cf8 origin/main
\f0\b0 \cf14 )\cf4 code: min \uc0\u1040 \u1080 \u1042 \
\cf8 |/\cf4 \
* \cf14 049d89c\cf4 code: max \uc0\u1040 \u1080 \u1042 \
* \cf14 87fc9e8\cf4 code: \uc0\u1091 \u1076 \u1072 \u1083 \u1077 \u1085 \u1080 \u1077 \u1079 \u1085 \u1072 \u1082 \u1072 \
* \cf14 30c5603\cf4 code: \uc0\u1076 \u1077 \u1083 \u1077 \u1085 \u1080 \u1077 \u1040 \u1085 \u1072 \u1042 \
* \cf14 d221187\cf4 code: \uc0\u1087 \u1088 \u1086 \u1080 \u1079 \u1074 \u1077 \u1076 \u1077 \u1085 \u1080 \u1077 \u1040 \u1080 \u1042 \
* \cf14 0f5bfc9\cf4 git: \uc0\u1089 \u1086 \u1079 \u1076 \u1072 \u1085 .gitignore\
* \cf14 b4c965e\cf4 Ignore Xcode user data\
* \cf14 73b73f1\cf4 code: \uc0\u1088 \u1072 \u1079 \u1085 \u1086 \u1089 \u1090 \u1100 \u1040 \u1080 \u1042 \
* \cf14 551b8a3\cf4 code: \uc0\u1089 \u1091 \u1084 \u1084 \u1072 \u1040 \u1080 \u1042 \
* \cf14 a4ecbfa\cf4 code: \uc0\u1074 \u1099 \u1074 \u1086 \u1076 \u1040 \u1080 \u1042 \
* \cf14 8388df1\cf4 build: \uc0\u1076 \u1086 \u1073 \u1072 \u1074 \u1083 \u1077 \u1085 \u1092 \u1072 \u1081 \u1083 \u1087 \u1088 \u1086 \u1077 \u1082 \u1090 \u1072 \
* \cf14 0fcaee1\cf4 code: \uc0\u1079 \u1072 \u1075 \u1086 \u1090 \u1086 \u1074 \u1082 \u1072 \u1087 \u1088 \u1086 \u1075 \u1088 \u1072 \u1084 \u1084 \u1099 \
\
29. \uc0\u1057 \u1083 \u1080 \u1103 \u1085 \u1080 \u1077 \u1074 \u1077 \u1090 \u1086 \u1082 \
\
svetlanarybakova@MacBook-Pro-Svetlana project % git merge double\
\
Auto-merging main.cpp\
Merge made by the 'ort' strategy.\
main.cpp | 2 \cf16 +\cf8 -\cf4 \
1 file changed, 1 insertion(+), 1 deletion(-)\
svetlanarybakova@MacBook-Pro-Svetlana project % git log --oneline --graph --all\
\
* \cf14 2d90237 (
\f1\b \cf15 HEAD -> \cf16 main
\f0\b0 \cf14 )\cf4 Merge branch 'double' to main\
\cf8 |\cf16 \\\cf4 \
\cf8 |\cf4 * \cf14 9d5c69f (
\f1\b \cf16 double
\f0\b0 \cf14 )\cf4 code: \uc0\u1080 \u1079 \u1084 \u1077 \u1085 \u1077 \u1085 \u1080 \u1077 \u1090 \u1080 \u1087 \u1072 \u1085 \u1072 double\
* \cf16 |\cf4 \cf14 f00b798 (
\f1\b \cf8 origin/main
\f0\b0 \cf14 )\cf4 code: min \uc0\u1040 \u1080 \u1042 \
\cf16 |/\cf4 \
* \cf14 049d89c\cf4 code: max \uc0\u1040 \u1080 \u1042 \
* \cf14 87fc9e8\cf4 code: \uc0\u1091 \u1076 \u1072 \u1083 \u1077 \u1085 \u1080 \u1077 \u1079 \u1085 \u1072 \u1082 \u1072 \
* \cf14 30c5603\cf4 code: \uc0\u1076 \u1077 \u1083 \u1077 \u1085 \u1080 \u1077 \u1040 \u1085 \u1072 \u1042 \
* \cf14 d221187\cf4 code: \uc0\u1087 \u1088 \u1086 \u1080 \u1079 \u1074 \u1077 \u1076 \u1077 \u1085 \u1080 \u1077 \u1040 \u1080 \u1042 \
* \cf14 0f5bfc9\cf4 git: \uc0\u1089 \u1086 \u1079 \u1076 \u1072 \u1085 .gitignore\
* \cf14 73b73f1\cf4 code: \uc0\u1088 \u1072 \u1079 \u1085 \u1086 \u1089 \u1090 \u1100 \u1040 \u1080 \u1042 \
* \cf14 551b8a3\cf4 code: \uc0\u1089 \u1091 \u1084 \u1084 \u1072 \u1040 \u1080 \u1042 \
* \cf14 a4ecbfa\cf4 code: \uc0\u1074 \u1099 \u1074 \u1086 \u1076 \u1040 \u1080 \u1042 \
* \cf14 8388df1\cf4 build: \uc0\u1076 \u1086 \u1073 \u1072 \u1074 \u1083 \u1077 \u1085 \u1092 \u1072 \u1081 \u1083 \u1087 \u1088 \u1086 \u1077 \u1082 \u1090 \u1072 \
* \cf14 0fcaee1\cf4 code: \uc0\u1079 \u1072 \u1075 \u1086 \u1090 \u1086 \u1074 \u1082 \u1072 \u1087 \u1088 \u1086 \u1075 \u1088 \u1072 \u1084 \u1084 \u1099 \
}
Ссылка в новой задаче View Git Blame Копировать постоянную ссылку