ChernovDY
/
cs-lab2
1
0
Форкнуть 0
Код Задачи Запросы на слияние Пакеты Проекты Релизы Вики Активность

Сравнить коммиты

Основа: ChernovDY:a5a72fc0f53b82ea7b235637fdecd417f40b0b65
Ветки Теги
ChernovDY:master
..
сравнить: ChernovDY:3c8d5b0b58bf0890c6cdabccee44fe622d3edc48
Ветки Теги
ChernovDY:master

Ничего общего в коммитах. 'a5a72fc0f53b82ea7b235637fdecd417f40b0b65' и '3c8d5b0b58bf0890c6cdabccee44fe622d3edc48' имеют совершенно разные истории.
a5a72fc0f5 ... 3c8d5b0b58

2 изменённых файлов: 0 добавлений и 824 удалений
Показать статистику

821
README.rtf
Unescape Просмотреть файл

@ -1,821 +0,0 @@
{\rtf1\ansi\ansicpg1251\cocoartf2639
\cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fswiss\fcharset0 Helvetica-Bold;\f1\fswiss\fcharset0 Helvetica;\f2\fnil\fcharset0 Menlo-Regular;
\f3\fnil\fcharset0 Menlo-Bold;}
{\colortbl;\red255\green255\blue255;\red0\green0\blue0;\red180\green36\blue25;\red47\green180\blue29;
\red159\green160\blue28;\red46\green174\blue187;}
{\*\expandedcolortbl;;\csgray\c0;\cssrgb\c76411\c21697\c12527;\cssrgb\c20241\c73898\c14950;
\cssrgb\c68469\c68012\c14211;\cssrgb\c20199\c73241\c78251;}
\paperw11900\paperh16840\margl1440\margr1440\vieww13540\viewh6360\viewkind0
\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\partightenfactor0
\f0\b\fs24 \cf0 \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 : \u1063 \u1077 \u1088 \u1085 \u1086 \u1074 \u1044 .\u1045 . \
\uc0\u1043 \u1088 \u1091 \u1087 \u1087 \u1072 : \u1040 -01-22 \
\uc0\u1055 \u1088 \u1086 \u1074 \u1077 \u1088 \u1080 \u1083 :
\f1\b0 \
\
\f0\b \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.
\f1\b0 \
\
\f0\b 1) \uc0\u1057 \u1086 \u1079 \u1076 \u1072 \u1083 \u1085 \u1072 \u1088 \u1072 \u1073 \u1086 \u1095 \u1077 \u1084 \u1089 \u1090 \u1086 \u1083 \u1077 \u1082 \u1072 \u1090 \u1072 \u1083 \u1086 \u1075 lab02\
\f1\b0 \
\f0\b 2) \uc0\u1055 \u1088 \u1086 \u1089 \u1084 \u1086 \u1090 \u1088 \u1077 \u1083 \u1092 \u1072 \u1081 \u1083 \u1099 \u1074 \u1088 \u1072 \u1073 \u1086 \u1095 \u1077 \u1084 \u1082 \u1072 \u1090 \u1072 \u1083 \u1086 \u1075 \u1077 \u1084 \u1086 \u1078 \u1085 \u1086 \u1082 \u1086 \u1084 \u1072 \u1085 \u1076 \u1086 \u1081 "ls\'bb(\u1087 \u1091 \u1089 \u1090 \u1086 ):
\f1\b0 \
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
\f2\fs22 \cf2 \CocoaLigature0 r.aliyakbyarov@a-aliyakbyarov-r lab02 % \
\
\f3\b 3) \uc0\u1057 \u1086 \u1079 \u1076 \u1072 \u1083 \u1082 \u1072 \u1090 \u1072 \u1083 \u1086 \u1075 \u1080 \u1040 \u1083 \u1080 \u1089 \u1099 \u1080 \u1041 \u1086 \u1073 \u1072 (mkdir Alice, mkdir bob), \u1089 \u1086 \u1079 \u1076 \u1072 \u1083 \u1082 \u1072 \u1090 \u1072 \u1083 \u1086 \u1075 "project", \
\uc0\u1080 \u1079 \u1091 \u1095 \u1080 \u1083 \u1082 \u1086 \u1084 \u1072 \u1085 \u1076 \u1091 "cd" \u1074 \u1087 \u1088 \u1086 \u1094 \u1077 \u1089 \u1089 \u1077 .\
\
4) \uc0\u1048 \u1085 \u1080 \u1094 \u1080 \u1072 \u1083 \u1080 \u1079 \u1080 \u1088 \u1086 \u1074 \u1072 \u1083 \u1088 \u1077 \u1087 \u1086 \u1079 \u1080 \u1090 \u1072 \u1088 \u1080 \u1081 (git init) \u1080 \u1095 \u1077 \u1088 \u1077 \u1079 \u1082 \u1086 \u1084 \u1072 \u1085 \u1076 \u1091 ls -A \u1091 \u1074 \u1080 \u1076 \u1077 \u1083 \u1077 \u1075 \u1086 \u1085 \u1072 \u1083 \u1080 \u1095 \u1080 \u1077 :\
\f2\b0 Initialized empty Git repository in /Users/r.aliyakbyarov/Desktop/lab02/alice/project/.git/\
\
.git\
r.aliyakbyarov@a-aliyakbyarov-r project % \
\f3\b \
5) \uc0\u1053 \u1072 \u1089 \u1090 \u1088 \u1086 \u1080 \u1083 \u1088 \u1077 \u1087 \u1086 \u1079 \u1080 \u1090 \u1072 \u1088 \u1080 \u1081 , \u1095 \u1090 \u1086 \u1073 \u1099 \u1082 \u1086 \u1084 \u1084 \u1080 \u1090 \u1099 \u1073 \u1099 \u1083 \u1080 \u1086 \u1090 \u1084 \u1086 \u1077 \u1075 \u1086 \u1080 \u1084 \u1077 \u1085 \u1080 :\
\f2\b0 r.aliyakbyarov@a-aliyakbyarov-r project % git config user.name 'Chernov DE'\
r.aliyakbyarov@a-aliyakbyarov-r project % git config user.email 'chernovdy@mpei.ru'\
\
\f3\b 6) \uc0\u1047 \u1072 \u1087 \u1091 \u1089 \u1090 \u1080 \u1083 CodeBlocks \u1080 \u1089 \u1086 \u1079 \u1076 \u1072 \u1083 \u1087 \u1088 \u1086 \u1077 \u1082 \u1090 \u1074 \u1088 \u1077 \u1087 \u1086 \u1079 \u1080 \u1090 \u1072 \u1088 \u1080 \u1080 \u1040 \u1083 \u1080 \u1089 \u1099 :\
\f2\b0 r.aliyakbyarov@a-aliyakbyarov-r project % git status
\f3\b \
\f2\b0 On branch master\
\
No commits yet\
\
Untracked files:\
(use "git add <file>..." to include in what will be committed)\
\
\cf3 main.cpp\
\cf2 \
\f3\b 7) \uc0\u1047 \u1072 \u1085 \u1086 \u1096 \u1091 \u1092 \u1072 \u1081 \u1083 main.cpp \u1087 \u1086 \u1076 Git(git add main.cpp):
\f2\b0 \
r.aliyakbyarov@a-aliyakbyarov-r project % git status\
On branch master\
\
No commits yet\
\
Changes to be committed:\
(use "git rm --cached <file>..." to unstage)\
\
\cf4 new file: main.cpp\cf2 \
\f3\b 8) \uc0\u1047 \u1072 \u1082 \u1086 \u1084 \u1080 \u1090 \u1080 \u1083 \u1092 \u1072 \u1081 \u1083 main.cpp \u1080 \u1085 \u1072 \u1079 \u1074 \u1072 \u1083 \u1079 \u1072 \u1075 \u1086 \u1090 \u1086 \u1074 \u1082 \u1086 \u1081 \u1087 \u1088 \u1086 \u1075 \u1088 \u1072 \u1084 \u1084 \u1099 :
\f2\b0 \
r.aliyakbyarov@a-aliyakbyarov-r project % git commit -m "code: \uc0\u1079 \u1072 \u1075 \u1086 \u1090 \u1086 \u1074 \u1082 \u1072 \u1087 \u1088 \u1086 \u1075 \u1088 \u1072 \u1084 \u1084 \u1099 "\
[master (root-commit) c4b85fe] code: \uc0\u1079 \u1072 \u1075 \u1086 \u1090 \u1086 \u1074 \u1082 \u1072 \u1087 \u1088 \u1086 \u1075 \u1088 \u1072 \u1084 \u1084 \u1099 \
1 file changed, 7 insertions(+)\
create mode 100644 main.cpp\
r.aliyakbyarov@a-aliyakbyarov-r project % \
\
\f3\b 9) \uc0\u1048 \u1089 \u1087 \u1086 \u1083 \u1100 \u1079 \u1086 \u1074 \u1072 \u1085 \u1080 \u1077 \u1082 \u1086 \u1084 \u1072 \u1085 \u1076 \u1099 $ git status \u1087 \u1086 \u1089 \u1083 \u1077 \u1080 \u1079 \u1084 \u1077 \u1085 \u1077 \u1085 \u1080 \u1103 \u1092 \u1072 \u1081 \u1083 \u1072 main.cpp:\
\f2\b0 r.aliyakbyarov@a-aliyakbyarov-r project % git status\
On branch master\
nothing to commit, working tree clean\
r.aliyakbyarov@a-aliyakbyarov-r project % \
\f3\b \
10) 1 \uc0\u1089 \u1087 \u1086 \u1089 \u1086 \u1073 \u1079 \u1072 \u1082 \u1086 \u1084 \u1080 \u1090 \u1080 \u1090 \u1100 \u1080 \u1079 \u1084 \u1077 \u1085 \u1077 \u1085 \u1080 \u1103 : \
\
\f2\b0 \uc0\u1042 \u1099 \u1073 \u1088 \u1072 \u1090 \u1100 \u1092 \u1072 \u1081 \u1083 \u1099 , \u1080 \u1079 \u1084 \u1077 \u1085 \u1077 \u1085 \u1080 \u1103 \u1082 \u1086 \u1090 \u1086 \u1088 \u1099 \u1093 \u1076 \u1086 \u1083 \u1078 \u1085 \u1099 \u1074 \u1086 \u1081 \u1090 \u1080 \u1074 \u1082 \u1086 \u1084 \u1084 \u1080 \u1090 , \u1079 \u1072 \u1090 \u1077 \u1084 \u1089 \u1076 \u1077 \u1083 \u1072 \u1090 \u1100 \u1082 \u1086 \u1084 \u1084 \u1080 \u1090 .
\f3\b \
\
2 \uc0\u1089 \u1087 \u1086 \u1089 \u1086 \u1073 \u1079 \u1072 \u1082 \u1086 \u1084 \u1080 \u1090 \u1080 \u1090 \u1100 \u1080 \u1079 \u1084 \u1077 \u1085 \u1077 \u1085 \u1080 \u1103 : \
\
\f2\b0 \uc0\u1044 \u1086 \u1073 \u1072 \u1074 \u1080 \u1090 \u1100 \u1074 \u1080 \u1085 \u1076 \u1077 \u1082 \u1089 \u1074 \u1089 \u1077 \u1080 \u1079 \u1084 \u1077 \u1085 \u1077 \u1085 \u1080 \u1103 , \u1079 \u1072 \u1090 \u1077 \u1084 \u1089 \u1076 \u1077 \u1083 \u1072 \u1090 \u1100 \u1082 \u1086 \u1084 \u1084 \u1080 \u1090 . \
\
r.aliyakbyarov@a-aliyakbyarov-r project % git add -u\
r.aliyakbyarov@a-aliyakbyarov-r project % git commit -m "\uc0\u1044 \u1086 \u1073 \u1072 \u1074 \u1080 \u1083 \u1074 \u1099 \u1074 \u1086 \u1076 "\
[master d67c777] \uc0\u1044 \u1086 \u1073 \u1072 \u1074 \u1080 \u1083 \u1074 \u1099 \u1074 \u1086 \u1076 \
1 file changed, 2 insertions(+), 2 deletions(-)
\f3\b \
\
3 \uc0\u1089 \u1087 \u1086 \u1089 \u1086 \u1073 \u1079 \u1072 \u1082 \u1086 \u1084 \u1080 \u1090 \u1080 \u1090 \u1100 \u1080 \u1079 \u1077 \u1085 \u1077 \u1085 \u1080 \u1103 : \
\
\f2\b0 \uc0\u1044 \u1086 \u1073 \u1072 \u1074 \u1080 \u1090 \u1100 \u1074 \u1089 \u1077 \u1080 \u1079 \u1084 \u1077 \u1085 \u1077 \u1085 \u1080 \u1103 \u1074 \u1080 \u1085 \u1076 \u1077 \u1082 \u1089 \u1080 \u1089 \u1076 \u1077 \u1083 \u1072 \u1090 \u1100 \u1082 \u1086 \u1084 \u1084 \u1080 \u1090 \u1074 \u1086 \u1076 \u1080 \u1085 \u1096 \u1072 \u1075 .\
\
r.aliyakbyarov@a-aliyakbyarov-r project % git commit -a -m "\uc0\u1044 \u1086 \u1073 \u1072 \u1074 \u1080 \u1083 \u1074 \u1099 \u1074 \u1086 \u1076 \u1088 \u1072 \u1079 \u1085 \u1080 \u1094 \u1099 "\
[master 1fd04d1] \uc0\u1044 \u1086 \u1073 \u1072 \u1074 \u1080 \u1083 \u1074 \u1099 \u1074 \u1086 \u1076 \u1088 \u1072 \u1079 \u1085 \u1080 \u1094 \u1099 \
1 file changed, 1 insertion(+), 1 deletion(-)\
\
\f3\b 11) \uc0\u1057 \u1086 \u1079 \u1076 \u1072 \u1083 \u1092 \u1072 \u1081 \u1083 .gitignore, \u1082 \u1086 \u1090 \u1086 \u1088 \u1099 \u1081 \u1080 \u1075 \u1085 \u1086 \u1088 \u1080 \u1088 \u1091 \u1077 \u1090 obj, bin, project.layout.\
\
\
\uc0\u1057 \u1076 \u1077 \u1083 \u1072 \u1083 \u1082 \u1086 \u1084 \u1084 \u1080 \u1090 :\
\f2\b0 r.aliyakbyarov@a-aliyakbyarov-r project % git add .gitignore\
r.aliyakbyarov@a-aliyakbyarov-r project % git commit -m "git: \uc0\u1048 \u1075 \u1085 \u1086 \u1088 \u1080 \u1088 \u1086 \u1074 \u1072 \u1085 \u1080 \u1077 \u1092 \u1072 \u1081 \u1083 \u1086 \u1074 "\
[master 50051e7] git: \uc0\u1048 \u1075 \u1085 \u1086 \u1088 \u1080 \u1088 \u1086 \u1074 \u1072 \u1085 \u1080 \u1077 \u1092 \u1072 \u1081 \u1083 \u1086 \u1074 \
1 file changed, 3 insertions(+)\
create mode 100644 .gitignore
\f3\b \
\
12)\uc0\u1055 \u1088 \u1086 \u1089 \u1084 \u1086 \u1090 \u1088 \u1077 \u1083 \u1082 \u1086 \u1084 \u1084 \u1080 \u1090 \u1099 \u1088 \u1077 \u1087 \u1086 \u1079 \u1080 \u1090 \u1072 \u1088 \u1080 \u1103 :\
\
\f2\b0 r.aliyakbyarov@a-aliyakbyarov-r project % git log --stat\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
\cf5 commit 50051e7e4018b9a9e9fc76451b5306ab5b1d37dd (
\f3\b \cf6 HEAD -> \cf4 master
\f2\b0 \cf5 )\cf2 \
Author: Chernov DE <chernovdy@mpei.ru>\
Date: Sun Mar 26 16:18:57 2023 +0300\
\
git: \uc0\u1048 \u1075 \u1085 \u1086 \u1088 \u1080 \u1088 \u1086 \u1074 \u1072 \u1085 \u1080 \u1077 \u1092 \u1072 \u1081 \u1083 \u1086 \u1074 \
\
.gitignore | 3 \cf4 +++\cf2 \
1 file changed, 3 insertions(+)\
\
\cf5 commit 1fd04d13e480e130c33f1348f0a8454fd6878471\cf2 \
Author: Chernov DE <chernovdy@mpei.ru>\
Date: Sun Mar 26 16:13:27 2023 +0300\
\
\uc0\u1044 \u1086 \u1073 \u1072 \u1074 \u1080 \u1083 \u1074 \u1099 \u1074 \u1086 \u1076 \u1088 \u1072 \u1079 \u1085 \u1080 \u1094 \u1099 \
\
main.cpp | 2 \cf4 +\cf3 -\cf2 \
1 file changed, 1 insertion(+), 1 deletion(-)\
\
\cf5 commit d67c7772ee8fa28d4d6e1e7c260467cacd1fde4e //\uc0\u1061 \u1101 \u1096 \u1082 \u1086 \u1084 \u1084 \u1080 \u1090 \u1072 \cf2 \
Author: Chernov DE <chernovdy@mpei.ru> //\uc0\u1071 \u1072 \u1074 \u1090 \u1086 \u1088 \
Date: Sun Mar 26 16:11:28 2023 +0300 //\uc0\u1044 \u1072 \u1090 \u1072 \
\
\uc0\u1044 \u1086 \u1073 \u1072 \u1074 \u1080 \u1083 \u1074 \u1099 \u1074 \u1086 \u1076 \
\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
\f3\b \
\uc0\u1044 \u1088 \u1091 \u1075 \u1086 \u1081 \u1074 \u1072 \u1088 \u1080 \u1072 \u1085 \u1090 :
\f2\b0 \
r.aliyakbyarov@a-aliyakbyarov-r project % git log --oneline --decorate\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
\cf5 50051e7 (
\f3\b \cf6 HEAD -> \cf4 master
\f2\b0 \cf5 )\cf2 git: \uc0\u1048 \u1075 \u1085 \u1086 \u1088 \u1080 \u1088 \u1086 \u1074 \u1072 \u1085 \u1080 \u1077 \u1092 \u1072 \u1081 \u1083 \u1086 \u1074 \
\cf5 1fd04d1\cf2 \uc0\u1044 \u1086 \u1073 \u1072 \u1074 \u1080 \u1083 \u1074 \u1099 \u1074 \u1086 \u1076 \u1088 \u1072 \u1079 \u1085 \u1080 \u1094 \u1099 \
\cf5 d67c777\cf2 \uc0\u1044 \u1086 \u1073 \u1072 \u1074 \u1080 \u1083 \u1074 \u1099 \u1074 \u1086 \u1076 \
\cf5 c4b85fe\cf2 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\pardirnatural\partightenfactor0
\f3\b \uc0\u1044 \u1088 \u1091 \u1075 \u1086 \u1081 \u1074 \u1072 \u1088 \u1080 \u1072 \u1085 \u1090 \u1095 \u1072 \u1089 \u1090 \u1100 2:\
\f2\b0 r.aliyakbyarov@a-aliyakbyarov-r project % git log --oneline --decorate --all --graph\
* \cf5 50051e7 (
\f3\b \cf6 HEAD -> \cf4 master
\f2\b0 \cf5 )\cf2 git: \uc0\u1048 \u1075 \u1085 \u1086 \u1088 \u1080 \u1088 \u1086 \u1074 \u1072 \u1085 \u1080 \u1077 \u1092 \u1072 \u1081 \u1083 \u1086 \u1074 \
* \cf5 1fd04d1\cf2 \uc0\u1044 \u1086 \u1073 \u1072 \u1074 \u1080 \u1083 \u1074 \u1099 \u1074 \u1086 \u1076 \u1088 \u1072 \u1079 \u1085 \u1080 \u1094 \u1099 \
* \cf5 d67c777\cf2 \uc0\u1044 \u1086 \u1073 \u1072 \u1074 \u1080 \u1083 \u1074 \u1099 \u1074 \u1086 \u1076 \
* \cf5 c4b85fe\cf2 code: \uc0\u1079 \u1072 \u1075 \u1086 \u1090 \u1086 \u1074 \u1082 \u1072 \u1087 \u1088 \u1086 \u1075 \u1088 \u1072 \u1084 \u1084 \u1099 \
\
\f3\b \uc0\u1055 \u1088 \u1086 \u1089 \u1084 \u1086 \u1090 \u1088 \u1086 \u1087 \u1088 \u1077 \u1076 \u1077 \u1083 \u1077 \u1085 \u1085 \u1086 \u1075 \u1086 \u1082 \u1086 \u1084 \u1084 \u1080 \u1090 \u1072 :
\f2\b0 \
r.aliyakbyarov@a-aliyakbyarov-r project % git log -- .gitignore\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
\cf5 commit 50051e7e4018b9a9e9fc76451b5306ab5b1d37dd (
\f3\b \cf6 HEAD -> \cf4 master
\f2\b0 \cf5 )\cf2 \
Author: Chernov DE <chernovdy@mpei.ru>\
Date: Sun Mar 26 16:18:57 2023 +0300\
\
git: \uc0\u1048 \u1075 \u1085 \u1086 \u1088 \u1080 \u1088 \u1086 \u1074 \u1072 \u1085 \u1080 \u1077 \u1092 \u1072 \u1081 \u1083 \u1086 \u1074 \
\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
\f3\b \uc0\u1055 \u1088 \u1086 \u1089 \u1084 \u1086 \u1090 \u1088 \u1086 \u1087 \u1088 \u1077 \u1076 \u1077 \u1083 \u1077 \u1085 \u1085 \u1086 \u1075 \u1086 \u1082 \u1086 \u1084 \u1084 \u1080 \u1090 \u1072 \u1087 \u1086 \u1090 \u1077 \u1084 \u1077 \'abgit:\'bb:
\f2\b0 \
r.aliyakbyarov@a-aliyakbyarov-r project % git log --grep "git: "\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
\cf5 commit 50051e7e4018b9a9e9fc76451b5306ab5b1d37dd (
\f3\b \cf6 HEAD -> \cf4 master
\f2\b0 \cf5 )\cf2 \
Author: Chernov DE <chernovdy@mpei.ru>\
Date: Sun Mar 26 16:18:57 2023 +0300\
\
git: \uc0\u1048 \u1075 \u1085 \u1086 \u1088 \u1080 \u1088 \u1086 \u1074 \u1072 \u1085 \u1080 \u1077 \u1092 \u1072 \u1081 \u1083 \u1086 \u1074 \
\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
\f3\b 13) \uc0\u1055 \u1088 \u1086 \u1089 \u1084 \u1086 \u1090 \u1088 \u1078 \u1091 \u1088 \u1085 \u1072 \u1083 \u1072 /\u1086 \u1087 \u1088 \u1077 \u1076 \u1077 \u1083 \u1077 \u1085 \u1085 \u1086 \u1075 \u1086 \u1082 \u1086 \u1084 \u1084 \u1080 \u1090 \u1072 :\
\
\uc0\u1058 \u1077 \u1082 \u1091 \u1097 \u1080 \u1081 \u1082 \u1086 \u1084 \u1084 \u1080 \u1090 :\
\f2\b0 r.aliyakbyarov@a-aliyakbyarov-r project % git show HEAD\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
\cf5 commit 50051e7e4018b9a9e9fc76451b5306ab5b1d37dd (
\f3\b \cf6 HEAD -> \cf4 master
\f2\b0 \cf5 )\cf2 \
Author: Chernov DE <chernovdy@mpei.ru>\
Date: Sun Mar 26 16:18:57 2023 +0300\
\
git: \uc0\u1048 \u1075 \u1085 \u1086 \u1088 \u1080 \u1088 \u1086 \u1074 \u1072 \u1085 \u1080 \u1077 \u1092 \u1072 \u1081 \u1083 \u1086 \u1074 \
\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
\f3\b diff --git a/.gitignore b/.gitignore
\f2\b0 \
\f3\b new file mode 100644
\f2\b0 \
\f3\b index 0000000..bdcd1e7
\f2\b0 \
\f3\b --- /dev/null
\f2\b0 \
\f3\b +++ b/.gitignore
\f2\b0 \
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
\cf6 @@ -0,0 +1,3 @@\cf2 \
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
\cf4 +/bin\cf2 \
\cf4 +/obj\cf2 \
\cf4 +/project.layout\cf2 \
\\ No newline at end of file\
\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
\f3\b \uc0\u1050 \u1086 \u1084 \u1084 \u1080 \u1090 \u1087 \u1086 \u1080 \u1084 \u1077 \u1085 \u1080 \u1074 \u1077 \u1090 \u1082 \u1080 :\
\f2\b0 r.aliyakbyarov@a-aliyakbyarov-r project % git show master\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
\cf5 commit 50051e7e4018b9a9e9fc76451b5306ab5b1d37dd (
\f3\b \cf6 HEAD -> \cf4 master
\f2\b0 \cf5 )\cf2 \
Author: Chernov DE <chernovdy@mpei.ru>\
Date: Sun Mar 26 16:18:57 2023 +0300\
\
git: \uc0\u1048 \u1075 \u1085 \u1086 \u1088 \u1080 \u1088 \u1086 \u1074 \u1072 \u1085 \u1080 \u1077 \u1092 \u1072 \u1081 \u1083 \u1086 \u1074 \
\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
\f3\b diff --git a/.gitignore b/.gitignore
\f2\b0 \
\f3\b new file mode 100644
\f2\b0 \
\f3\b index 0000000..bdcd1e7
\f2\b0 \
\f3\b --- /dev/null
\f2\b0 \
\f3\b +++ b/.gitignore
\f2\b0 \
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
\cf6 @@ -0,0 +1,3 @@\cf2 \
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
\cf4 +/bin\cf2 \
\cf4 +/obj\cf2 \
\cf4 +/project.layout\cf2 \
\\ No newline at end of file\
\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
\f3\b \uc0\u1055 \u1086 \u1093 \u1077 \u1096 \u1091 \u1085 \u1091 \u1078 \u1085 \u1086 \u1075 \u1086 \u1082 \u1086 \u1084 \u1084 \u1080 \u1090 \u1072 :\
\f2\b0 r.aliyakbyarov@a-aliyakbyarov-r project % git show 50051e7e4018b9a9e9fc76451b5306ab5b1d37dd\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
\cf5 commit 50051e7e4018b9a9e9fc76451b5306ab5b1d37dd (
\f3\b \cf6 HEAD -> \cf4 master
\f2\b0 \cf5 )\cf2 \
Author: Chernov DE <chernovdy@mpei.ru>\
Date: Sun Mar 26 16:18:57 2023 +0300\
\
git: \uc0\u1048 \u1075 \u1085 \u1086 \u1088 \u1080 \u1088 \u1086 \u1074 \u1072 \u1085 \u1080 \u1077 \u1092 \u1072 \u1081 \u1083 \u1086 \u1074 \
\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
\f3\b diff --git a/.gitignore b/.gitignore
\f2\b0 \
\f3\b new file mode 100644
\f2\b0 \
\f3\b index 0000000..bdcd1e7
\f2\b0 \
\f3\b --- /dev/null
\f2\b0 \
\f3\b +++ b/.gitignore
\f2\b0 \
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
\cf6 @@ -0,0 +1,3 @@\cf2 \
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
\cf4 +/bin\cf2 \
\cf4 +/obj\cf2 \
\cf4 +/project.layout\cf2 \
\\ No newline at end of file\
\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
\f3\b 14) \uc0\u1055 \u1088 \u1086 \u1089 \u1084 \u1086 \u1090 \u1088 \u1080 \u1079 \u1084 \u1077 \u1085 \u1077 \u1085 \u1080 \u1081 : \
\
\uc0\u1055 \u1088 \u1086 \u1089 \u1084 \u1086 \u1090 \u1088 \u1080 \u1084 \u1080 \u1079 \u1084 \u1077 \u1085 \u1077 \u1085 \u1080 \u1103 \u1088 \u1072 \u1073 \u1086 \u1095 \u1077 \u1081 \u1082 \u1086 \u1087 \u1080 \u1080 :
\f2\b0 \
r.aliyakbyarov@a-aliyakbyarov-r project % git diff\
\f3\b diff --git a/main.cpp b/main.cpp
\f2\b0 \
\f3\b index 94f324b..a771f65 100644
\f2\b0 \
\f3\b --- a/main.cpp
\f2\b0 \
\f3\b +++ b/main.cpp
\f2\b0 \
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
\cf6 @@ -3,5 +3,5 @@\cf2 using namespace std;\
int main()\{\
int A,B;\
cin>>A>>B;\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
\cf3 - cout << "A + B = " << a + b << '\\n'<< "A - B = " << a - b << '\\n';\cf2 \
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
\cf4 + cout << "A + B = " << A + B << '\\n'<< "A - B = " << A - B << '\\n'<<"A * B = "<< A*B;\cf2 \
\}\
\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
\f3\b \uc0\u1055 \u1086 \u1082 \u1072 \u1079 \u1080 \u1079 \u1084 \u1077 \u1085 \u1077 \u1085 \u1080 \u1081 \u1086 \u1087 \u1088 \u1077 \u1076 \u1077 \u1083 \u1077 \u1085 \u1085 \u1086 \u1075 \u1086 \u1082 \u1086 \u1084 \u1080 \u1090 \u1072 \u1095 \u1077 \u1088 \u1077 \u1079 \u1091 \u1082 \u1072 \u1079 \u1072 \u1085 \u1080 \u1077 \u1072 \u1088 \u1075 \u1091 \u1084 \u1077 \u1085 \u1090 \u1072 \u1082 \u1086 \u1084 \u1072 \u1085 \u1076 \u1099 :
\f2\b0 \
r.aliyakbyarov@a-aliyakbyarov-r project % git diff HEAD~2\
\f3\b diff --git a/.gitignore b/.gitignore
\f2\b0 \
\f3\b new file mode 100644
\f2\b0 \
\f3\b index 0000000..bdcd1e7
\f2\b0 \
\f3\b --- /dev/null
\f2\b0 \
\f3\b +++ b/.gitignore
\f2\b0 \
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
\cf6 @@ -0,0 +1,3 @@\cf2 \
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
\cf4 +/bin\cf2 \
\cf4 +/obj\cf2 \
\cf4 +/project.layout\cf2 \
\\ No newline at end of file\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
\f3\b diff --git a/main.cpp b/main.cpp
\f2\b0 \
\f3\b index d12efe0..a771f65 100644
\f2\b0 \
\f3\b --- a/main.cpp
\f2\b0 \
\f3\b +++ b/main.cpp
\f2\b0 \
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
\cf6 @@ -3,5 +3,5 @@\cf2 using namespace std;\
int main()\{\
int A,B;\
cin>>A>>B;\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
\cf3 - cout << "A + B = " << a + b << '\\n';\cf2 \
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
\cf4 + cout << "A + B = " << A + B << '\\n'<< "A - B = " << A - B << '\\n'<<"A * B = "<< A*B;\cf2 \
\}\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
\f3\b \
\uc0\u1055 \u1088 \u1086 \u1089 \u1084 \u1086 \u1090 \u1088 \u1080 \u1079 \u1084 \u1077 \u1085 \u1077 \u1085 \u1080 \u1081 \u1087 \u1077 \u1088 \u1074 \u1086 \u1075 \u1086 \u1080 \u1087 \u1086 \u1089 \u1083 \u1077 \u1076 \u1085 \u1077 \u1075 \u1086 \u1082 \u1086 \u1084 \u1084 \u1080 \u1090 \u1072 :\
\
\f2\b0 r.aliyakbyarov@a-aliyakbyarov-r project % git diff c4b85fe 1fd04d1\
\f3\b diff --git a/main.cpp b/main.cpp
\f2\b0 \
\f3\b index 3a81897..94f324b 100644
\f2\b0 \
\f3\b --- a/main.cpp
\f2\b0 \
\f3\b +++ b/main.cpp
\f2\b0 \
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
\cf6 @@ -2,6 +2,6 @@\cf2 \
using namespace std;\
int main()\{\
int A,B;\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
\cf3 - cin>>A;\cf2 \
\cf3 - cin>>B;\cf2 \
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
\cf4 + cin>>A>>B;\cf2 \
\cf4 + cout << "A + B = " << a + b << '\\n'<< "A - B = " << a - b << '\\n';\cf2 \
\}
\f3\b \
\
\
15) \uc0\u1054 \u1090 \u1082 \u1072 \u1090 \u1080 \u1079 \u1084 \u1077 \u1085 \u1077 \u1085 \u1080 \u1081 \
\
\uc0\u1042 \u1086 -\u1087 \u1077 \u1088 \u1074 \u1099 \u1093 , \u1089 \u1076 \u1077 \u1083 \u1072 \u1083 \u1080 \u1079 \u1084 \u1077 \u1085 \u1077 \u1085 \u1080 \u1077 \u1074 \u1087 \u1088 \u1086 \u1075 \u1088 \u1072 \u1084 \u1084 \u1077 (\u1076 \u1086 \u1073 \u1072 \u1074 \u1080 \u1083 \u1087 \u1088 \u1086 \u1080 \u1079 \u1074 \u1077 \u1076 \u1077 \u1085 \u1080 \u1077 ) \u1080 \u1079 \u1072 \u1082 \u1086 \u1084 \u1080 \u1090 \u1080 \u1083 \u1080 \u1079 \u1084 \u1077 \u1085 \u1077 \u1085 \u1080 \u1103 \
\uc0\u1044 \u1072 \u1083 \u1077 \u1077 \u1076 \u1077 \u1083 \u1072 \u1077 \u1084 \u1086 \u1090 \u1082 \u1072 \u1090 \u1080 \u1079 \u1084 \u1077 \u1085 \u1077 \u1085 \u1080 \u1081 \u1082 \u1087 \u1088 \u1077 \u1076 \u1099 \u1076 \u1091 \u1097 \u1077 \u1081 \u1074 \u1077 \u1088 \u1089 \u1080 \u1080 :\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
\f2\b0 r.aliyakbyarov@a-aliyakbyarov-r project % git reset --hard HEAD~1\
HEAD is now at 50051e7 git: \uc0\u1048 \u1075 \u1085 \u1086 \u1088 \u1080 \u1088 \u1086 \u1074 \u1072 \u1085 \u1080 \u1077 \u1092 \u1072 \u1081 \u1083 \u1086 \u1074 \
\
\f3\b \uc0\u1080 \u1083 \u1080 \u1076 \u1086 \u1073 \u1072 \u1074 \u1080 \u1084 \u1082 \u1086 \u1084 \u1084 \u1077 \u1085 \u1090 \u1072 \u1088 \u1080 \u1081 \u1085 \u1072 \u1076 main() \u1080 \u1086 \u1090 \u1082 \u1072 \u1090 \u1080 \u1084 \u1101 \u1090 \u1086 \u1090 \u1092 \u1072 \u1081 \u1083 \u1082 \u1089 \u1086 \u1089 \u1090 \u1086 \u1103 \u1085 \u1080 \u1102 \u1074 \u1087 \u1086 \u1089 \u1083 \u1077 \u1076 \u1085 \u1077 \u1084 \u1082 \u1086 \u1084 \u1084 \u1080 \u1090 \u1077 :\
\f2\b0 r.aliyakbyarov@a-aliyakbyarov-r project % git checkout HEAD\
M main.cpp
\f3\b \
\
16) \uc0\u1057 \u1086 \u1079 \u1076 \u1072 \u1085 \u1080 \u1077 \u1087 \u1072 \u1088 \u1099 \u1082 \u1083 \u1102 \u1095 \u1077 \u1081 \u1076 \u1083 \u1103 \u1076 \u1086 \u1089 \u1090 \u1091 \u1087 \u1072 \u1082 \u1089 \u1077 \u1088 \u1074 \u1077 \u1088 \u1091 \
\
17) \uc0\u1057 \u1086 \u1079 \u1076 \u1072 \u1077 \u1084 \u1088 \u1077 \u1087 \u1086 \u1079 \u1080 \u1090 \u1072 \u1088 \u1080 \u1081 \u1087 \u1086 \u1076 \u1085 \u1072 \u1079 \u1074 \u1072 \u1085 \u1080 \u1077 \u1084 cs-lab02.\
\
\uc0\u1044 \u1072 \u1083 \u1077 \u1077 \u1082 \u1083 \u1086 \u1085 \u1080 \u1088 \u1091 \u1077 \u1084 \u1087 \u1088 \u1086 \u1077 \u1082 \u1090 \u1074 \u1082 \u1072 \u1090 \u1072 \u1083 \u1086 \u1075 Bob:
\f2\b0 \
r.aliyakbyarov@a-aliyakbyarov-r project % git clone git@uit.mpei.ru:Danila_Chernov/cs-lab2.git project
\f3\b \
\f2\b0 \
\f3\b \uc0\u1055 \u1086 \u1089 \u1083 \u1077 \u1085 \u1072 \u1089 \u1090 \u1088 \u1072 \u1080 \u1074 \u1072 \u1077 \u1084 git \u1082 \u1086 \u1085 \u1092 \u1080 \u1075 \u1082 \u1072 \u1082 \u1089 Alice:\
\f2\b0 r.aliyakbyarov@a-aliyakbyarov-r project % git config user.name "Bob (ChernovDE)"\
r.aliyakbyarov@a-aliyakbyarov-r project % git config user.email 'Chernovdy@mpei.ru' \
\
\f3\b 18)\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 :\
\f2\b0 \
\f3\b \'ab\uc0\u1053 \u1072 \u1084 \u1072 \u1096 \u1080 \u1085 \u1077 \u1041 \u1086 \u1073 \u1072 \'bb \u1076 \u1086 \u1073 \u1072 \u1074 \u1083 \u1103 \u1077 \u1084 \u1074 \u1087 \u1088 \u1086 \u1075 \u1088 \u1072 \u1084 \u1084 \u1091 \u1087 \u1077 \u1095 \u1072 \u1090 \u1100 \u1087 \u1088 \u1086 \u1080 \u1079 \u1074 \u1077 \u1076 \u1077 \u1085 \u1080 \u1103 \u1095 \u1080 \u1089 \u1077 \u1083 \u1080 \u1076 \u1077 \u1083 \u1072 \u1077 \u1084 \u1082 \u1086 \u1084 \u1084 \u1080 \u1090 :\
\f2\b0 r.aliyakbyarov@a-aliyakbyarov-r project % git add main.cpp\
r.aliyakbyarov@a-aliyakbyarov-r project % git commit -m "\uc0\u1042 \u1099 \u1074 \u1086 \u1076 \u1087 \u1088 \u1086 \u1080 \u1079 \u1074 \u1077 \u1076 \u1077 \u1085 \u1080 \u1103 \u1073 \u1086 \u1073 \u1072 "\
[master 9a5bee8] \uc0\u1042 \u1099 \u1074 \u1086 \u1076 \u1087 \u1088 \u1086 \u1080 \u1079 \u1074 \u1077 \u1076 \u1077 \u1085 \u1080 \u1103 \u1073 \u1086 \u1073 \u1072 \
1 file changed, 1 insertion(+), 1 deletion(-)\
\
\
\f3\b \uc0\u1054 \u1090 \u1087 \u1088 \u1072 \u1074 \u1083 \u1103 \u1077 \u1084 \u1082 \u1086 \u1084 \u1084 \u1080 \u1090 \u1085 \u1072 \u1089 \u1077 \u1088 \u1074 \u1077 \u1088 :\
\f2\b0 r.aliyakbyarov@a-aliyakbyarov-r project % git push\
Enter passphrase for key '/Users/r.aliyakbyarov/.ssh/id_rsa': \
Counting objects: 3, done.\
Delta compression using up to 8 threads.\
Compressing objects: 100% (3/3), done.\
Writing objects: 100% (3/3), 392 bytes | 392.00 KiB/s, done.\
Total 3 (delta 1), reused 0 (delta 0)\
remote: . Processing 1 references\
remote: Processed 1 references in total\
To uit.mpei.ru:Danila_Chernov/cs-lab2.git\
50051e7..9a5bee8 master -> master\
r.aliyakbyarov@a-aliyakbyarov-r project % \
\f3\b \
\'ab\uc0\u1053 \u1072 \u1084 \u1072 \u1096 \u1080 \u1085 \u1077 \u1040 \u1083 \u1080 \u1089 \u1099 \'bb \u1074 \u1099 \u1087 \u1086 \u1083 \u1085 \u1080 \u1090 \u1100 \u1079 \u1072 \u1075 \u1088 \u1091 \u1079 \u1082 \u1091 \u1080 \u1079 \u1084 \u1077 \u1085 \u1077 \u1085 \u1080 \u1081 :
\f2\b0 \
r.aliyakbyarov@a-aliyakbyarov-r 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), done.\
From uit.mpei.ru:Danila_Chernov/cs-lab2\
50051e7..9a5bee8 master -> origin/master\
r.aliyakbyarov@a-aliyakbyarov-r project % \
\
\f3\b \uc0\u1055 \u1088 \u1086 \u1089 \u1084 \u1086 \u1090 \u1088 \u1080 \u1084 \u1080 \u1089 \u1090 \u1086 \u1088 \u1080 \u1102 \u1074 \u1089 \u1077 \u1093 \u1074 \u1077 \u1090 \u1086 \u1082 :\
\f2\b0 r.aliyakbyarov@a-aliyakbyarov-r project % git log --oneline --decorate --all --graph\
* \cf5 9a5bee8 (
\f3\b \cf3 origin/master
\f2\b0 \cf5 )\cf2 \uc0\u1042 \u1099 \u1074 \u1086 \u1076 \u1087 \u1088 \u1086 \u1080 \u1079 \u1074 \u1077 \u1076 \u1077 \u1085 \u1080 \u1103 \u1073 \u1086 \u1073 \u1072 \
* \cf5 50051e7 (
\f3\b \cf6 HEAD -> \cf4 master
\f2\b0 \cf5 )\cf2 git: \uc0\u1048 \u1075 \u1085 \u1086 \u1088 \u1080 \u1088 \u1086 \u1074 \u1072 \u1085 \u1080 \u1077 \u1092 \u1072 \u1081 \u1083 \u1086 \u1074 \
* \cf5 1fd04d1\cf2 \uc0\u1044 \u1086 \u1073 \u1072 \u1074 \u1080 \u1083 \u1074 \u1099 \u1074 \u1086 \u1076 \u1088 \u1072 \u1079 \u1085 \u1080 \u1094 \u1099 \
* \cf5 d67c777\cf2 \uc0\u1044 \u1086 \u1073 \u1072 \u1074 \u1080 \u1083 \u1074 \u1099 \u1074 \u1086 \u1076 \
* \cf5 c4b85fe\cf2 code: \uc0\u1079 \u1072 \u1075 \u1086 \u1090 \u1086 \u1074 \u1082 \u1072 \u1087 \u1088 \u1086 \u1075 \u1088 \u1072 \u1084 \u1084 \u1099 \
\
\f3\b \uc0\u1050 \u1072 \u1082 \u1084 \u1086 \u1078 \u1085 \u1086 \u1074 \u1080 \u1076 \u1077 \u1090 \u1100 , \u1074 \u1077 \u1090 \u1082 \u1072 master \u1086 \u1090 \u1089 \u1090 \u1072 \u1077 \u1090 \u1085 \u1072 \u1086 \u1076 \u1080 \u1085 \u1082 \u1086 \u1084 \u1084 \u1080 \u1090 \u1086 \u1090 \u1074 \u1077 \u1090 \u1082 \u1080 origin/master. \u1055 \u1088 \u1086 \u1076 \u1074 \u1080 \u1085 \u1077 \u1084 \u1074 \u1077 \u1090 \u1082 \u1091 master \u1082 \u1089 \u1082 \u1072 \u1095 \u1072 \u1085 \u1085 \u1086 \u1081 \u1074 \u1077 \u1088 \u1089 \u1080 \u1080 : git pull --ff-only\
\
\f2\b0 r.aliyakbyarov@a-aliyakbyarov-r project % git pull --ff-only\
Updating 50051e7..9a5bee8\
Fast-forward\
main.cpp | 2 \cf4 +\cf3 -\cf2 \
1 file changed, 1 insertion(+), 1 deletion(-)\
\
r.aliyakbyarov@a-aliyakbyarov-r project % git log --oneline --decorate --all --graph\
\
* \cf5 9a5bee8 (
\f3\b \cf6 HEAD -> \cf4 master
\f2\b0 \cf5 ,
\f3\b \cf3 origin/master
\f2\b0 \cf5 )\cf2 \uc0\u1042 \u1099 \u1074 \u1086 \u1076 \u1087 \u1088 \u1086 \u1080 \u1079 \u1074 \u1077 \u1076 \u1077 \u1085 \u1080 \u1103 \u1073 \u1086 \u1073 \u1072 \
* \cf5 50051e7\cf2 git: \uc0\u1048 \u1075 \u1085 \u1086 \u1088 \u1080 \u1088 \u1086 \u1074 \u1072 \u1085 \u1080 \u1077 \u1092 \u1072 \u1081 \u1083 \u1086 \u1074 \
* \cf5 1fd04d1\cf2 \uc0\u1044 \u1086 \u1073 \u1072 \u1074 \u1080 \u1083 \u1074 \u1099 \u1074 \u1086 \u1076 \u1088 \u1072 \u1079 \u1085 \u1080 \u1094 \u1099 \
* \cf5 d67c777\cf2 \uc0\u1044 \u1086 \u1073 \u1072 \u1074 \u1080 \u1083 \u1074 \u1099 \u1074 \u1086 \u1076 \
* \cf5 c4b85fe\cf2 code: \uc0\u1079 \u1072 \u1075 \u1086 \u1090 \u1086 \u1074 \u1082 \u1072 \u1087 \u1088 \u1086 \u1075 \u1088 \u1072 \u1084 \u1084 \u1099 \
\f3\b \
18) \uc0\u1056 \u1072 \u1079 \u1088 \u1077 \u1096 \u1077 \u1085 \u1080 \u1077 \u1082 \u1086 \u1085 \u1092 \u1083 \u1080 \u1082 \u1090 \u1086 \u1074 \u1087 \u1088 \u1080 \u1089 \u1086 \u1074 \u1084 \u1077 \u1089 \u1090 \u1085 \u1086 \u1081 \u1088 \u1072 \u1073 \u1086 \u1090 \u1077 :\
\
\uc0\u1044 \u1086 \u1087 \u1086 \u1083 \u1085 \u1080 \u1084 \u1091 Alice \u1074 \u1099 \u1074 \u1086 \u1076 \u1084 \u1072 \u1082 \u1089 \u1080 \u1084 \u1091 \u1084 \u1072 , \u1091 Bob - \u1074 \u1099 \u1074 \u1086 \u1076 \u1084 \u1080 \u1085 \u1080 \u1084 \u1091 \u1084 \u1072 , \u1087 \u1086 \u1087 \u1088 \u1086 \u1073 \u1091 \u1077 \u1084 \u1089 \u1076 \u1077 \u1083 \u1072 \u1090 \u1100 \u1082 \u1086 \u1084 \u1084 \u1080 \u1090 \u1080 \u1086 \u1090 \u1087 \u1088 \u1072 \u1074 \u1080 \u1090 \u1100 \u1077 \u1075 \u1086 \u1085 \u1072 \u1089 \u1077 \u1088 \u1074 \u1077 \u1088 :\
\f2\b0 \
\f3\b \uc0\u1044 \u1083 \u1103 Alice:\
\f2\b0 r.aliyakbyarov@a-aliyakbyarov-r project % git add main.cpp\
r.aliyakbyarov@a-aliyakbyarov-r project % git commit -m "\uc0\u1072 \u1083 \u1080 \u1089 \u1072 \u1080 \u1097 \u1077 \u1090 \u1084 \u1072 \u1082 \u1089 \u1080 \u1084 \u1091 \u1084 "\
[master c5dcc2d] \uc0\u1072 \u1083 \u1080 \u1089 \u1072 \u1080 \u1097 \u1077 \u1090 \u1084 \u1072 \u1082 \u1089 \u1080 \u1084 \u1091 \u1084 \
1 file changed, 1 insertion(+), 1 deletion(-)\
r.aliyakbyarov@a-aliyakbyarov-r project % git add main.cpp\
r.aliyakbyarov@a-aliyakbyarov-r project % git commit -m "\uc0\u1074 \u1099 \u1074 \u1086 \u1076 \u1084 \u1072 \u1082 \u1089 \u1089 \u1082 \u1072 \u1074 \u1099 \u1095 \u1082 \u1072 \u1084 \u1080 "\
[master f2baa24] \uc0\u1074 \u1099 \u1074 \u1086 \u1076 \u1084 \u1072 \u1082 \u1089 \u1089 \u1082 \u1072 \u1074 \u1099 \u1095 \u1082 \u1072 \u1084 \u1080 \
1 file changed, 3 insertions(+), 2 deletions(-)\
r.aliyakbyarov@a-aliyakbyarov-r project % git push\
Counting objects: 6, done.\
Delta compression using up to 8 threads.\
Compressing objects: 100% (6/6), done.\
Writing objects: 100% (6/6), 678 bytes | 678.00 KiB/s, done.\
Total 6 (delta 2), reused 0 (delta 0)\
remote: . Processing 1 references\
remote: Processed 1 references in total\
To uit.mpei.ru:Danila_Chernov/cs-lab2.git\
f6267f9..f2baa24 master -> master\
\f3\b \uc0\u1044 \u1083 \u1103 Bob:\
\f2\b0 r.aliyakbyarov@a-aliyakbyarov-r project % git add main.cpp\
r.aliyakbyarov@a-aliyakbyarov-r project % git commit -m "\uc0\u1052 \u1080 \u1085 \u1080 \u1084 \u1091 \u1084 \u1089 \u1082 \u1072 \u1074 \u1099 \u1095 \u1082 \u1072 \u1084 \u1080 "\
[master deaadf7] \uc0\u1052 \u1080 \u1085 \u1080 \u1084 \u1091 \u1084 \u1089 \u1082 \u1072 \u1074 \u1099 \u1095 \u1082 \u1072 \u1084 \u1080 \
1 file changed, 2 insertions(+), 2 deletions(-)\
r.aliyakbyarov@a-aliyakbyarov-r project % git push\
Enter passphrase for key '/Users/r.aliyakbyarov/.ssh/id_rsa': \
To uit.mpei.ru:Danila_Chernov/cs-lab2.git\
! [rejected] master -> master (fetch first)\
error: failed to push some refs to 'git@uit.mpei.ru:Danila_Chernov/cs-lab2.git'\
hint: Updates were rejected because the remote contains work that you do\
hint: not have locally. This is usually caused by another repository pushing\
hint: to the same ref. You may want to first integrate the remote changes\
hint: (e.g., 'git pull ...') before pushing again.\
hint: See the 'Note about fast-forwards' in 'git push --help' for details.\
\f3\b \
\uc0\u1059 \u1076 \u1072 \u1083 \u1077 \u1085 \u1085 \u1099 \u1081 \u1088 \u1077 \u1087 \u1086 \u1079 \u1080 \u1090 \u1072 \u1088 \u1080 \u1081 \u1085 \u1077 \u1087 \u1088 \u1080 \u1085 \u1080 \u1084 \u1072 \u1077 \u1090 \u1080 \u1079 \u1084 \u1077 \u1085 \u1077 \u1085 \u1080 \u1081 : \u1082 \u1086 \u1084 \u1084 \u1080 \u1090 \u1041 \u1086 \u1073 \u1072 \u1086 \u1089 \u1085 \u1086 \u1074 \u1072 \u1085 \u1085 \u1077 \u1085 \u1072 \u1087 \u1086 \u1089 \u1083 \u1077 \u1076 \u1085 \u1077 \u1084 \u1089 \u1091 \u1097 \u1077 \u1089 \u1090 \u1074 \u1091 \u1102 \u1097 \u1077 \u1084 \u1082 \u1086 \u1084 \u1084 \u1080 \u1090 \u1077 .\
\f2\b0 \
\f3\b \uc0\u1047 \u1072 \u1075 \u1088 \u1091 \u1079 \u1080 \u1084 \u1082 \u1086 \u1084 \u1084 \u1080 \u1090 \u1080 \u1079 \u1091 \u1076 \u1072 \u1083 \u1077 \u1085 \u1085 \u1086 \u1075 \u1086 \u1093 \u1088 \u1072 \u1085 \u1080 \u1083 \u1080 \u1097 \u1072 \u1080 \u1087 \u1086 \u1089 \u1083 \u1077 \u1086 \u1090 \u1086 \u1073 \u1088 \u1072 \u1079 \u1080 \u1084 \u1080 \u1089 \u1090 \u1086 \u1088 \u1080 \u1102 \u1074 \u1089 \u1077 \u1093 \u1074 \u1077 \u1090 \u1086 \u1082 :\
\
\f2\b0 r.aliyakbyarov@a-aliyakbyarov-r project % git pull --ff-only\
Enter passphrase for key '/Users/r.aliyakbyarov/.ssh/id_rsa': \
remote: Enumerating objects: 8, done.\
remote: Counting objects: 100% (8/8), done.\
remote: Compressing objects: 100% (6/6), done.\
remote: Total 6 (delta 2), reused 0 (delta 0), pack-reused 0\
Unpacking objects: 100% (6/6), done.\
From uit.mpei.ru:Danila_Chernov/cs-lab2\
f6267f9..f2baa24 master -> origin/master\
fatal: Not possible to fast-forward, aborting.\
r.aliyakbyarov@a-aliyakbyarov-r project % git log --oneline --decorate --all --graph\
\
* \cf5 deaadf7 (
\f3\b \cf6 HEAD -> \cf4 master
\f2\b0 \cf5 )\cf2 \uc0\u1052 \u1080 \u1085 \u1080 \u1084 \u1091 \u1084 \u1089 \u1082 \u1072 \u1074 \u1099 \u1095 \u1082 \u1072 \u1084 \u1080 \
* \cf5 05278b3\cf2 \uc0\u1055 \u1086 \u1080 \u1089 \u1082 \u1084 \u1080 \u1085 \u1073 \u1086 \u1073 \
* \cf5 508adc4\cf2 \uc0\u1053 \u1072 \u1096 \u1077 \u1083 \u1084 \u1080 \u1085 \u1080 \u1084 \u1091 \u1084 \u1091 \u1073 \u1086 \u1073 \u1072 \
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
\cf3 |\cf2 * \cf5 f2baa24 (
\f3\b \cf3 origin/master
\f2\b0 \cf5 ,
\f3\b \cf3 origin/HEAD
\f2\b0 \cf5 )\cf2 \uc0\u1074 \u1099 \u1074 \u1086 \u1076 \u1084 \u1072 \u1082 \u1089 \u1089 \u1082 \u1072 \u1074 \u1099 \u1095 \u1082 \u1072 \u1084 \u1080 \
\cf3 |\cf2 * \cf5 c5dcc2d\cf2 \uc0\u1072 \u1083 \u1080 \u1089 \u1072 \u1080 \u1097 \u1077 \u1090 \u1084 \u1072 \u1082 \u1089 \u1080 \u1084 \u1091 \u1084 \
\cf3 |/\cf2 \
* \cf5 f6267f9\cf2 \uc0\u1044 \u1086 \u1073 \u1072 \u1074 \u1080 \u1083 \u1074 \u1040 \u1083 \u1080 \u1089 \u1091 \u1084 \u1072 \u1082 \u1089 \
* \cf5 dd7d994\cf2 \uc0\u1044 \u1086 \u1073 \u1072 \u1074 \u1080 \u1083 \u1074 \u1099 \u1074 \u1086 \u1076 \u1076 \u1077 \u1083 \u1077 \u1085 \u1080 \u1103 \
* \cf5 9a5bee8\cf2 \uc0\u1042 \u1099 \u1074 \u1086 \u1076 \u1087 \u1088 \u1086 \u1080 \u1079 \u1074 \u1077 \u1076 \u1077 \u1085 \u1080 \u1103 \u1073 \u1086 \u1073 \u1072 \
* \cf5 50051e7\cf2 git: \uc0\u1048 \u1075 \u1085 \u1086 \u1088 \u1080 \u1088 \u1086 \u1074 \u1072 \u1085 \u1080 \u1077 \u1092 \u1072 \u1081 \u1083 \u1086 \u1074 \
* \cf5 1fd04d1\cf2 \uc0\u1044 \u1086 \u1073 \u1072 \u1074 \u1080 \u1083 \u1074 \u1099 \u1074 \u1086 \u1076 \u1088 \u1072 \u1079 \u1085 \u1080 \u1094 \u1099 \
* \cf5 d67c777\cf2 \uc0\u1044 \u1086 \u1073 \u1072 \u1074 \u1080 \u1083 \u1074 \u1099 \u1074 \u1086 \u1076 \
* \cf5 c4b85fe\cf2 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\pardirnatural\partightenfactor0
\f3\b \
\uc0\u1052 \u1086 \u1078 \u1085 \u1086 \u1074 \u1080 \u1076 \u1077 \u1090 \u1100 , \u1095 \u1090 \u1086 \u1074 \u1077 \u1090 \u1082 \u1072 main \u1083 \u1086 \u1082 \u1072 \u1083 \u1100 \u1085 \u1086 \u1075 \u1086 \u1088 \u1077 \u1087 \u1086 \u1079 \u1080 \u1090 \u1072 \u1088 \u1080 \u1103 \u1088 \u1072 \u1079 \u1086 \u1096 \u1083 \u1072 \u1089 \u1100 \u1089 \u1074 \u1077 \u1090 \u1082 \u1086 \u1081 origin/master, \u1090 \u1086 \u1077 \u1089 \u1090 \u1100 \u1089 \u1074 \u1077 \u1090 \u1082 \u1086 \u1081 main \u1085 \u1072 \u1089 \u1077 \u1088 \u1074 \u1077 \u1088 \u1077 .
\f2\b0 \
\
\f3\b \uc0\u1055 \u1077 \u1088 \u1077 \u1084 \u1077 \u1089 \u1090 \u1080 \u1084 \u1082 \u1086 \u1084 \u1084 \u1080 \u1090 Bob\u1072 \u1087 \u1086 \u1074 \u1077 \u1088 \u1093 \u1082 \u1086 \u1084 \u1084 \u1080 \u1090 \u1072 \u1040 \u1083 \u1080 \u1089 \u1099 , \u1090 \u1086 \u1077 \u1089 \u1090 \u1100 \u1087 \u1086 \u1074 \u1077 \u1088 \u1093 origin/master:
\f2\b0 \
r.aliyakbyarov@a-aliyakbyarov-r project % git rebase origin/master\
First, rewinding head to replay your work on top of it...\
Applying: \uc0\u1055 \u1086 \u1080 \u1089 \u1082 \u1084 \u1080 \u1085 \u1073 \u1086 \u1073 \
Using index info to reconstruct a base tree...\
M main.cpp\
Falling back to patching base and 3-way merge...\
Auto-merging main.cpp\
CONFLICT (content): Merge conflict in main.cpp\
error: Failed to merge in the changes.\
Patch failed at 0001 \uc0\u1055 \u1086 \u1080 \u1089 \u1082 \u1084 \u1080 \u1085 \u1073 \u1086 \u1073 \
The copy of the patch that failed is found in: .git/rebase-apply/patch\
\
Resolve all conflicts manually, mark them as resolved with\
"git add/rm <conflicted_files>", then run "git rebase --continue".\
You can instead skip this commit: run "git rebase --skip".\
To abort and get back to the state before "git rebase", run "git rebase --abort".\
\
r.aliyakbyarov@a-aliyakbyarov-r project % \
\
\
\f3\b \uc0\u1050 \u1086 \u1084 \u1072 \u1085 \u1076 \u1072 \u1079 \u1072 \u1074 \u1077 \u1088 \u1096 \u1072 \u1077 \u1090 \u1089 \u1103 \u1089 \u1086 \u1096 \u1080 \u1073 \u1082 \u1086 \u1081 , \u1089 \u1086 \u1086 \u1073 \u1097 \u1072 \u1102 \u1097 \u1077 \u1081 \u1086 \u1082 \u1086 \u1085 \u1092 \u1083 \u1080 \u1082 \u1090 \u1077 \u1074 main.cpp. \
\
\uc0\u1055 \u1088 \u1086 \u1074 \u1077 \u1088 \u1080 \u1084 \u1089 \u1090 \u1072 \u1090 \u1091 \u1089 \u1088 \u1077 \u1087 \u1086 \u1079 \u1080 \u1090 \u1072 \u1088 \u1080 \u1103 :\
\
\f2\b0 r.aliyakbyarov@a-aliyakbyarov-r project % git status\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
\cf3 rebase in progress; onto \cf2 f2baa24\
You are currently rebasing branch 'master' on 'f2baa24'.\
(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 reset HEAD <file>..." to unstage)\
(use "git add <file>..." to mark resolution)\
\
\cf3 both modified: main.cpp\cf2 \
\
Untracked files:\
(use "git add <file>..." to include in what will be committed)\
\
\cf3 main\cf2 \
\cf3 main.dSYM/\cf2 \
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
\f3\b \
\uc0\u1058 \u1077 \u1087 \u1077 \u1088 \u1100 \u1088 \u1072 \u1079 \u1088 \u1077 \u1096 \u1080 \u1084 \u1082 \u1086 \u1085 \u1092 \u1083 \u1080 \u1082 \u1090 \u1080 \u1087 \u1086 \u1089 \u1083 \u1077 \u1076 \u1086 \u1073 \u1072 \u1074 \u1083 \u1103 \u1077 \u1084 \u1092 \u1072 \u1081 \u1083 \u1074 \u1080 \u1085 \u1076 \u1077 \u1082 \u1089 , \u1087 \u1088 \u1086 \u1076 \u1086 \u1083 \u1078 \u1072 \u1077 \u1084 \u1087 \u1088 \u1077 \u1088 \u1074 \u1072 \u1085 \u1085 \u1091 \u1102 \u1086 \u1087 \u1077 \u1088 \u1072 \u1094 \u1080 \u1102 rebase: \
\f2\b0 r.aliyakbyarov@a-aliyakbyarov-r project % git add main.cpp\
r.aliyakbyarov@a-aliyakbyarov-r project % git rebase --continue\
Applying: \uc0\u1052 \u1080 \u1085 \u1080 \u1084 \u1091 \u1084 \u1089 \u1082 \u1072 \u1074 \u1099 \u1095 \u1082 \u1072 \u1084 \u1080 \
\f3\b \
\uc0\u1055 \u1088 \u1086 \u1074 \u1077 \u1088 \u1103 \u1077 \u1084 , \u1095 \u1090 \u1086 \u1073 \u1099 \u1080 \u1089 \u1090 \u1086 \u1088 \u1080 \u1103 \u1093 \u1088 \u1072 \u1085 \u1080 \u1083 \u1080 \u1097 \u1072 \u1073 \u1099 \u1083 \u1072 \u1074 \u1085 \u1072 \u1076 \u1083 \u1077 \u1078 \u1072 \u1097 \u1077 \u1084 \u1074 \u1080 \u1076 \u1077 :\
\f2\b0 r.aliyakbyarov@a-aliyakbyarov-r project % git log --oneline --decorate --all --graph\
* \cf5 e237ba1 (
\f3\b \cf6 HEAD -> \cf4 master
\f2\b0 \cf5 )\cf2 \uc0\u1052 \u1080 \u1085 \u1080 \u1084 \u1091 \u1084 \u1089 \u1082 \u1072 \u1074 \u1099 \u1095 \u1082 \u1072 \u1084 \u1080 \
* \cf5 4504c5a\cf2 \uc0\u1055 \u1086 \u1080 \u1089 \u1082 \u1084 \u1080 \u1085 \u1073 \u1086 \u1073 \
* \cf5 f2baa24 (
\f3\b \cf3 origin/master
\f2\b0 \cf5 ,
\f3\b \cf3 origin/HEAD
\f2\b0 \cf5 )\cf2 \uc0\u1074 \u1099 \u1074 \u1086 \u1076 \u1084 \u1072 \u1082 \u1089 \u1089 \u1082 \u1072 \u1074 \u1099 \u1095 \u1082 \u1072 \u1084 \u1080 \
* \cf5 c5dcc2d\cf2 \uc0\u1072 \u1083 \u1080 \u1089 \u1072 \u1080 \u1097 \u1077 \u1090 \u1084 \u1072 \u1082 \u1089 \u1080 \u1084 \u1091 \u1084 \
* \cf5 f6267f9\cf2 \uc0\u1044 \u1086 \u1073 \u1072 \u1074 \u1080 \u1083 \u1074 \u1040 \u1083 \u1080 \u1089 \u1091 \u1084 \u1072 \u1082 \u1089 \
* \cf5 dd7d994\cf2 \uc0\u1044 \u1086 \u1073 \u1072 \u1074 \u1080 \u1083 \u1074 \u1099 \u1074 \u1086 \u1076 \u1076 \u1077 \u1083 \u1077 \u1085 \u1080 \u1103 \
* \cf5 9a5bee8\cf2 \uc0\u1042 \u1099 \u1074 \u1086 \u1076 \u1087 \u1088 \u1086 \u1080 \u1079 \u1074 \u1077 \u1076 \u1077 \u1085 \u1080 \u1103 \u1073 \u1086 \u1073 \u1072 \
* \cf5 50051e7\cf2 git: \uc0\u1048 \u1075 \u1085 \u1086 \u1088 \u1080 \u1088 \u1086 \u1074 \u1072 \u1085 \u1080 \u1077 \u1092 \u1072 \u1081 \u1083 \u1086 \u1074 \
* \cf5 1fd04d1\cf2 \uc0\u1044 \u1086 \u1073 \u1072 \u1074 \u1080 \u1083 \u1074 \u1099 \u1074 \u1086 \u1076 \u1088 \u1072 \u1079 \u1085 \u1080 \u1094 \u1099 \
* \cf5 d67c777\cf2 \uc0\u1044 \u1086 \u1073 \u1072 \u1074 \u1080 \u1083 \u1074 \u1099 \u1074 \u1086 \u1076 \
* \cf5 c4b85fe\cf2 code: \uc0\u1079 \u1072 \u1075 \u1086 \u1090 \u1086 \u1074 \u1082 \u1072 \u1087 \u1088 \u1086 \u1075 \u1088 \u1072 \u1084 \u1084 \u1099 \
\f3\b \
19) \uc0\u1048 \u1089 \u1087 \u1086 \u1083 \u1100 \u1079 \u1086 \u1074 \u1072 \u1085 \u1080 \u1077 \u1074 \u1077 \u1090 \u1086 \u1082 \
\
\uc0\u1057 \u1086 \u1079 \u1076 \u1072 \u1076 \u1080 \u1084 \u1074 \u1077 \u1090 \u1082 \u1091 double:\
\f2\b0 r.aliyakbyarov@a-aliyakbyarov-r project % git branch double\
\
\f3\b \uc0\u1055 \u1077 \u1088 \u1077 \u1082 \u1083 \u1102 \u1095 \u1080 \u1084 \u1089 \u1103 \u1085 \u1072 \u1085 \u1077 \u1077 :\
\f2\b0 r.aliyakbyarov@a-aliyakbyarov-r project % git checkout double\
Switched to branch 'double\
\
\f3\b \uc0\u1047 \u1072 \u1084 \u1077 \u1085 \u1080 \u1084 \u1090 \u1080 \u1087 \u1087 \u1077 \u1088 \u1077 \u1084 \u1077 \u1085 \u1085 \u1099 \u1093 \u1072 \u1080 b \u1085 \u1072 double \u1080 \u1089 \u1076 \u1077 \u1083 \u1072 \u1077 \u1084 \u1082 \u1086 \u1084 \u1084 \u1080 \u1090 :\
\f2\b0 r.aliyakbyarov@a-aliyakbyarov-r project % git add main.cpp\
r.aliyakbyarov@a-aliyakbyarov-r project % git commit -m " \uc0\u1048 \u1079 \u1084 \u1077 \u1085 \u1077 \u1085 \u1080 \u1077 \u1090 \u1080 \u1087 \u1072 \u1085 \u1072 double" \
[double 673590f] \uc0\u1048 \u1079 \u1084 \u1077 \u1085 \u1077 \u1085 \u1080 \u1077 \u1090 \u1080 \u1087 \u1072 \u1085 \u1072 double\
1 file changed, 1 insertion(+), 1 deletion(-)\
\
\f3\b \uc0\u1055 \u1077 \u1088 \u1077 \u1082 \u1083 \u1102 \u1095 \u1080 \u1084 \u1089 \u1103 \u1085 \u1072 \u1074 \u1077 \u1090 \u1082 \u1091 master: \
\f2\b0 r.aliyakbyarov@a-aliyakbyarov-r project % git checkout master\
Switched to branch 'master'\
Your branch is up to date with 'origin/master'.
\f3\b \
\
\uc0\u1057 \u1080 \u1085 \u1093 \u1088 \u1086 \u1085 \u1080 \u1079 \u1080 \u1088 \u1091 \u1077 \u1084 \u1074 \u1077 \u1090 \u1082 \u1091 master \'ab\u1085 \u1072 \u1084 \u1072 \u1096 \u1080 \u1085 \u1077 \u1040 \u1083 \u1080 \u1089 \u1099 \'bb \u1089 \u1089 \u1077 \u1088 \u1074 \u1077 \u1088 \u1086 \u1084 .\
\
\uc0\u1055 \u1088 \u1086 \u1076 \u1074 \u1080 \u1085 \u1077 \u1084 \u1074 \u1077 \u1090 \u1082 \u1091 master \u1082 \u1089 \u1082 \u1072 \u1095 \u1072 \u1085 \u1085 \u1086 \u1081 \u1074 \u1077 \u1088 \u1089 \u1080 \u1080 .\
\
\uc0\u1055 \u1088 \u1086 \u1089 \u1084 \u1086 \u1090 \u1088 \u1080 \u1084 \u1080 \u1089 \u1090 \u1086 \u1088 \u1080 \u1102 \u1074 \u1089 \u1077 \u1093 \u1074 \u1077 \u1090 \u1086 \u1082 :\
\f2\b0 r.aliyakbyarov@a-aliyakbyarov-r project % git log --oneline --decorate --all --graph\
* \cf5 673590f (
\f3\b \cf4 double
\f2\b0 \cf5 )\cf2 \uc0\u1048 \u1079 \u1084 \u1077 \u1085 \u1077 \u1085 \u1080 \u1077 \u1090 \u1080 \u1087 \u1072 \u1085 \u1072 double\
* \cf5 f2baa24 (
\f3\b \cf6 HEAD -> \cf4 master
\f2\b0 \cf5 ,
\f3\b \cf3 origin/master
\f2\b0 \cf5 )\cf2 \uc0\u1074 \u1099 \u1074 \u1086 \u1076 \u1084 \u1072 \u1082 \u1089 \u1089 \u1082 \u1072 \u1074 \u1099 \u1095 \u1082 \u1072 \u1084 \u1080 \
* \cf5 c5dcc2d\cf2 \uc0\u1072 \u1083 \u1080 \u1089 \u1072 \u1080 \u1097 \u1077 \u1090 \u1084 \u1072 \u1082 \u1089 \u1080 \u1084 \u1091 \u1084 \
* \cf5 f6267f9\cf2 \uc0\u1044 \u1086 \u1073 \u1072 \u1074 \u1080 \u1083 \u1074 \u1040 \u1083 \u1080 \u1089 \u1091 \u1084 \u1072 \u1082 \u1089 \
* \cf5 dd7d994\cf2 \uc0\u1044 \u1086 \u1073 \u1072 \u1074 \u1080 \u1083 \u1074 \u1099 \u1074 \u1086 \u1076 \u1076 \u1077 \u1083 \u1077 \u1085 \u1080 \u1103 \
* \cf5 9a5bee8\cf2 \uc0\u1042 \u1099 \u1074 \u1086 \u1076 \u1087 \u1088 \u1086 \u1080 \u1079 \u1074 \u1077 \u1076 \u1077 \u1085 \u1080 \u1103 \u1073 \u1086 \u1073 \u1072 \
* \cf5 50051e7\cf2 git: \uc0\u1048 \u1075 \u1085 \u1086 \u1088 \u1080 \u1088 \u1086 \u1074 \u1072 \u1085 \u1080 \u1077 \u1092 \u1072 \u1081 \u1083 \u1086 \u1074 \
* \cf5 1fd04d1\cf2 \uc0\u1044 \u1086 \u1073 \u1072 \u1074 \u1080 \u1083 \u1074 \u1099 \u1074 \u1086 \u1076 \u1088 \u1072 \u1079 \u1085 \u1080 \u1094 \u1099 \
* \cf5 d67c777\cf2 \uc0\u1044 \u1086 \u1073 \u1072 \u1074 \u1080 \u1083 \u1074 \u1099 \u1074 \u1086 \u1076 \
* \cf5 c4b85fe\cf2 code: \uc0\u1079 \u1072 \u1075 \u1086 \u1090 \u1086 \u1074 \u1082 \u1072 \u1087 \u1088 \u1086 \u1075 \u1088 \u1072 \u1084 \u1084 \u1099 \
r.aliyakbyarov@a-aliyakbyarov-r project % \
\f3\b \
\uc0\u1057 \u1086 \u1083 \u1100 \u1077 \u1084 \u1074 \u1077 \u1090 \u1082 \u1080 double \u1080 master:\
\f2\b0 r.aliyakbyarov@a-aliyakbyarov-r project % git merge double\
Updating f2baa24..673590f\
Fast-forward\
main.cpp | 2 \cf4 +\cf3 -\cf2 \
1 file changed, 1 insertion(+), 1 deletion(-)\
\
\f3\b \uc0\u1055 \u1088 \u1086 \u1089 \u1084 \u1086 \u1090 \u1088 \u1080 \u1084 \u1080 \u1089 \u1090 \u1086 \u1088 \u1080 \u1102 \u1074 \u1089 \u1077 \u1093 \u1074 \u1077 \u1090 \u1086 \u1082 \u1088 \u1077 \u1087 \u1086 \u1079 \u1080 \u1090 \u1072 \u1088 \u1080 \u1103 :\
\f2\b0 r.aliyakbyarov@a-aliyakbyarov-r project % git log --oneline --decorate --all --graph\
\
* \cf5 673590f (
\f3\b \cf6 HEAD -> \cf4 master
\f2\b0 \cf5 ,
\f3\b \cf4 double
\f2\b0 \cf5 )\cf2 \uc0\u1048 \u1079 \u1084 \u1077 \u1085 \u1077 \u1085 \u1080 \u1077 \u1090 \u1080 \u1087 \u1072 \u1085 \u1072 double\
* \cf5 f2baa24 (
\f3\b \cf3 origin/master
\f2\b0 \cf5 )\cf2 \uc0\u1074 \u1099 \u1074 \u1086 \u1076 \u1084 \u1072 \u1082 \u1089 \u1089 \u1082 \u1072 \u1074 \u1099 \u1095 \u1082 \u1072 \u1084 \u1080 \
* \cf5 c5dcc2d\cf2 \uc0\u1072 \u1083 \u1080 \u1089 \u1072 \u1080 \u1097 \u1077 \u1090 \u1084 \u1072 \u1082 \u1089 \u1080 \u1084 \u1091 \u1084 \
* \cf5 f6267f9\cf2 \uc0\u1044 \u1086 \u1073 \u1072 \u1074 \u1080 \u1083 \u1074 \u1040 \u1083 \u1080 \u1089 \u1091 \u1084 \u1072 \u1082 \u1089 \
* \cf5 dd7d994\cf2 \uc0\u1044 \u1086 \u1073 \u1072 \u1074 \u1080 \u1083 \u1074 \u1099 \u1074 \u1086 \u1076 \u1076 \u1077 \u1083 \u1077 \u1085 \u1080 \u1103 \
* \cf5 9a5bee8\cf2 \uc0\u1042 \u1099 \u1074 \u1086 \u1076 \u1087 \u1088 \u1086 \u1080 \u1079 \u1074 \u1077 \u1076 \u1077 \u1085 \u1080 \u1103 \u1073 \u1086 \u1073 \u1072 \
* \cf5 50051e7\cf2 git: \uc0\u1048 \u1075 \u1085 \u1086 \u1088 \u1080 \u1088 \u1086 \u1074 \u1072 \u1085 \u1080 \u1077 \u1092 \u1072 \u1081 \u1083 \u1086 \u1074 \
* \cf5 1fd04d1\cf2 \uc0\u1044 \u1086 \u1073 \u1072 \u1074 \u1080 \u1083 \u1074 \u1099 \u1074 \u1086 \u1076 \u1088 \u1072 \u1079 \u1085 \u1080 \u1094 \u1099 \
* \cf5 d67c777\cf2 \uc0\u1044 \u1086 \u1073 \u1072 \u1074 \u1080 \u1083 \u1074 \u1099 \u1074 \u1086 \u1076 \
* \cf5 c4b85fe\cf2 code: \uc0\u1079 \u1072 \u1075 \u1086 \u1090 \u1086 \u1074 \u1082 \u1072 \u1087 \u1088 \u1086 \u1075 \u1088 \u1072 \u1084 \u1084 \u1099 \
r.aliyakbyarov@a-aliyakbyarov-r project %
\f3\b \
\f2\b0 \
\f3\b \
\
\f2\b0 \
}

3
main.cpp
Unescape Просмотреть файл

@ -9,8 +9,5 @@ int main(){
if (A>B){ if (A>B){
cout<<A;} cout<<A;}
else {cout<<B;} else {cout<<B;}
if (A>B){
cout<<A;}
else {cout<<B;}
} }

Редактирование Предпросмотр
Загрузка…
Отмена
Сохранить