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

конец

Просмотр исходного кода
master
u111-09 2 лет назад
Родитель f0a1776b3f
Сommit 08b6ba2dd7
2 изменённых файлов: 1346 добавлений и 0 удалений
Показать статистику Скачать Patch файл Скачать Diff файл

810
lab02alice.txt
Unescape Просмотреть файл

@ -0,0 +1,810 @@
u111-09@PROG-29 MINGW32 ~/Desktop/lab02
$ ls
u111-09@PROG-29 MINGW32 ~/Desktop/lab02
$ mkdir alice
u111-09@PROG-29 MINGW32 ~/Desktop/lab02
$ mkdir bob
u111-09@PROG-29 MINGW32 ~/Desktop/lab02
$ cd alice
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice
$ cd alice
bash: cd: alice: No such file or directory
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice
$ cd ..
u111-09@PROG-29 MINGW32 ~/Desktop/lab02
$ cd ..
u111-09@PROG-29 MINGW32 ~/Desktop
$ cd project
bash: cd: project: No such file or directory
u111-09@PROG-29 MINGW32 ~/Desktop
$ cd alice
bash: cd: alice: No such file or directory
u111-09@PROG-29 MINGW32 ~/Desktop
$ cd lab02
u111-09@PROG-29 MINGW32 ~/Desktop/lab02
$ cd alice
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice
$ cd project
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project
$ cd ..
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice
$ cd project
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project
$ git init
Initialized empty Git repository in C:/Users/u111-09/Desktop/lab02/alice/project/.git/
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ git branch -m main
error: refname refs/heads/master not found
fatal: Branch rename failed
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ ls -A
.git/
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ git config user.name 'Alice (KonovalovaAA)'
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ git config user.email 'KonovalovaAlA@mpei.ru'
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ git status
On branch master
No commits yet ----- еще нет коммитов
Untracked files:
(use "git add <file>..." to include in what will be committed)
main.cpp
project.cbp
nothing added to commit but untracked files present (use "git add" to track) ----- ничего не закоммичено, но присутствуют неотслеживаемые файлы
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ git add main.cpp
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ git status
On branch master
No commits yet
Changes to be committed:
(use "git rm --cached <file>..." to unstage)
new file: main.cpp ---- файл внесен в git, отслеживается гитом
Untracked files:
(use "git add <file>..." to include in what will be committed)
project.cbp
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ git commit -m 'code: заготовка программы'
[master (root-commit) 375569d] code: caaioiaea i?ia?aiiu
1 file changed, 9 insertions(+)
create mode 100644 main.cpp
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ git add project.cbp
warning: LF will be replaced by CRLF in project.cbp.
The file will have its original line endings in your working directory
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ git commit -m 'build: add project file'
[master 1b4a85a] build: add project file
1 file changed, 40 insertions(+)
create mode 100644 project.cbp
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ git status
On branch master
nothing to commit, working tree clean
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ git status
On branch master
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
modified: main.cpp -----файл изменен, но изменение не закоммичены
no changes added to commit (use "git add" and/or "git commit -a")
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ git add main.cpp
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ git commit -m 'code: вывод суммы'
[master f02e566] code: вывод суммы
1 file changed, 4 insertions(+), 1 deletion(-)
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ git add -u
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ git add -u
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ git commit -m 'code: вывод разности'
[master ea9094f] code: вывод разности
1 file changed, 2 insertions(+), 1 deletion(-)
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ git status
On branch master
Untracked files:
(use "git add <file>..." to include in what will be committed)
.gitignore
nothing added to commit but untracked files present (use "git add" to track)
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ git status
On branch master
Untracked files:
(use "git add <file>..." to include in what will be committed)
.gitignore
obj/
nothing added to commit but untracked files present (use "git add" to track)
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ git status
On branch master
Untracked files:
(use "git add <file>..." to include in what will be committed)
.gitignore
nothing added to commit but untracked files present (use "git add" to track)
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ git status
On branch master
Untracked files:
(use "git add <file>..." to include in what will be committed)
.gitignore
nothing added to commit but untracked files present (use "git add" to track)
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ git add .gitignore
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ git commit -m 'git: ..'
[master 92be9fc] git: ..
1 file changed, 2 insertions(+)
create mode 100644 .gitignore
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ git log --stat
commit 92be9fc8d2f44f0be31ea0795c9ba7aa0c28bc1d (HEAD -> master)
Author: Alice (KonovalovaAA) <KonovalovaAlA@mpei.ru>
Date: Mon Mar 13 15:06:51 2023 +0300
git: ..
.gitignore | 2 ++
1 file changed, 2 insertions(+) ----- 1 файл изменен, добавлены 2 вставки
commit ea9094fd2f1ced3bbce27b5e15ad28d4b8b3d34c
Author: Alice (KonovalovaAA) <KonovalovaAlA@mpei.ru>
Date: Mon Mar 13 14:38:38 2023 +0300
code: вывод разности
main.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
commit f02e56655a5149c1d19cfafe2e8014b19127461e
Author: Alice (KonovalovaAA) <KonovalovaAlA@mpei.ru>
Date: Mon Mar 13 14:34:56 2023 +0300
code: вывод суммы
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ git log --oneline --decorate
92be9fc (HEAD -> master) git: ..
ea9094f code: вывод разности
f02e566 code: вывод суммы
1b4a85a build: add project file
375569d code: заготовка программы
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ git log --decorate
commit 92be9fc8d2f44f0be31ea0795c9ba7aa0c28bc1d (HEAD -> master)
Author: Alice (KonovalovaAA) <KonovalovaAlA@mpei.ru>
Date: Mon Mar 13 15:06:51 2023 +0300
git: ..
commit ea9094fd2f1ced3bbce27b5e15ad28d4b8b3d34c
Author: Alice (KonovalovaAA) <KonovalovaAlA@mpei.ru>
Date: Mon Mar 13 14:38:38 2023 +0300
code: вывод разности
commit f02e56655a5149c1d19cfafe2e8014b19127461e
Author: Alice (KonovalovaAA) <KonovalovaAlA@mpei.ru>
Date: Mon Mar 13 14:34:56 2023 +0300
code: вывод суммы
commit 1b4a85a93e714b9992e12a78bee0d6993febb6f6
Author: Alice (KonovalovaAA) <KonovalovaAlA@mpei.ru>
Date: Mon Mar 13 14:22:51 2023 +0300
build: add project file
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ git log --oneline --decorate --all --graph
* 92be9fc (HEAD -> master) git: ..
* ea9094f code: вывод разности
* f02e566 code: вывод суммы
* 1b4a85a build: add project file
* 375569d code: заготовка программы
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ git log -- project.cbp
commit 1b4a85a93e714b9992e12a78bee0d6993febb6f6
Author: Alice (KonovalovaAA) <KonovalovaAlA@mpei.ru>
Date: Mon Mar 13 14:22:51 2023 +0300
build: add project file
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ git log --grep "build:"
commit 1b4a85a93e714b9992e12a78bee0d6993febb6f6
Author: Alice (KonovalovaAA) <KonovalovaAlA@mpei.ru>
Date: Mon Mar 13 14:22:51 2023 +0300
build: add project file
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ git show HEAD
commit 92be9fc8d2f44f0be31ea0795c9ba7aa0c28bc1d (HEAD -> master)
Author: Alice (KonovalovaAA) <KonovalovaAlA@mpei.ru>
Date: Mon Mar 13 15:06:51 2023 +0300
git: ..
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..4c7473d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+/bin
+/obj
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ git show 1b4a85a93e714b9992e12a78bee0d6993febb6f6
commit 1b4a85a93e714b9992e12a78bee0d6993febb6f6
Author: Alice (KonovalovaAA) <KonovalovaAlA@mpei.ru>
Date: Mon Mar 13 14:22:51 2023 +0300
build: add project file
diff --git a/project.cbp b/project.cbp
new file mode 100644
index 0000000..99bb702
--- /dev/null
+++ b/project.cbp
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_project_file>
+ <FileVersion major="1" minor="6" />
+ <Project>
+ <Option title="project" />
+ <Option pch_mode="2" />
+ <Option compiler="gcc" />
+ <Build>
+ <Target title="Debug">
+ <Option output="bin/Debug/project" prefix_auto="1" extension_auto="1" />
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ git show HEAD
commit 92be9fc8d2f44f0be31ea0795c9ba7aa0c28bc1d (HEAD -> master)
Author: Alice (KonovalovaAA) <KonovalovaAlA@mpei.ru>
Date: Mon Mar 13 15:06:51 2023 +0300
git: ..
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..4c7473d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+/bin
+/obj
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ git show HEAD~1
commit ea9094fd2f1ced3bbce27b5e15ad28d4b8b3d34c
Author: Alice (KonovalovaAA) <KonovalovaAlA@mpei.ru>
Date: Mon Mar 13 14:38:38 2023 +0300
code: вывод разности
diff --git a/main.cpp b/main.cpp
index 6de6dd2..d8da497 100644
--- a/main.cpp
+++ b/main.cpp
@@ -7,6 +7,7 @@ int main()
cout << "Enter A and B: ";
int a, b;
cin >> a >> b;
- cout << "A + B = " << a + b << '\n';
+ cout << "A + B = " << a + b << '\n'
+ << "A - B = " << a - b << '\n';
return 0;
}
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ git diff
diff --git a/main.cpp b/main.cpp
index d8da497..ba644d3 100644
--- a/main.cpp
+++ b/main.cpp
@@ -8,6 +8,7 @@ int main()
int a, b;
cin >> a >> b;
cout << "A + B = " << a + b << '\n'
- << "A - B = " << a - b << '\n';
+ << "A - B = " << a - b << '\n'
+ << "A * B = " << a * b << '\n';
return 0;
}
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ git diff HEAD~2 HEAD
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..4c7473d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+/bin
+/obj
diff --git a/main.cpp b/main.cpp
index 6de6dd2..d8da497 100644
--- a/main.cpp
+++ b/main.cpp
@@ -7,6 +7,7 @@ int main()
cout << "Enter A and B: ";
int a, b;
cin >> a >> b;
- cout << "A + B = " << a + b << '\n';
+ cout << "A + B = " << a + b << '\n'
+ << "A - B = " << a - b << '\n';
return 0;
}
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ git diff HEAD
diff --git a/main.cpp b/main.cpp
index d8da497..ba644d3 100644
--- a/main.cpp
+++ b/main.cpp
@@ -8,6 +8,7 @@ int main()
int a, b;
cin >> a >> b;
cout << "A + B = " << a + b << '\n'
- << "A - B = " << a - b << '\n';
+ << "A - B = " << a - b << '\n'
+ << "A * B = " << a * b << '\n';
return 0;
}
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ git diff HEAD~3 HEAD
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..4c7473d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+/bin
+/obj
diff --git a/main.cpp b/main.cpp
index b4392ec..d8da497 100644
--- a/main.cpp
+++ b/main.cpp
@@ -4,6 +4,10 @@ using namespace std;
int main()
{
- cout << "Hello world!" << endl;
+ cout << "Enter A and B: ";
+ int a, b;
+ cin >> a >> b;
+ cout << "A + B = " << a + b << '\n'
+ << "A - B = " << a - b << '\n';
return 0;
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ git diff HEAD~1 HEAD~2
diff --git a/main.cpp b/main.cpp
index d8da497..6de6dd2 100644
--- a/main.cpp
+++ b/main.cpp
@@ -7,7 +7,6 @@ int main()
cout << "Enter A and B: ";
int a, b;
cin >> a >> b;
- cout << "A + B = " << a + b << '\n'
- << "A - B = " << a - b << '\n';
+ cout << "A + B = " << a + b << '\n';
return 0;
}
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ git log
commit 92be9fc8d2f44f0be31ea0795c9ba7aa0c28bc1d (HEAD -> master)
Author: Alice (KonovalovaAA) <KonovalovaAlA@mpei.ru>
Date: Mon Mar 13 15:06:51 2023 +0300
git: ..
commit ea9094fd2f1ced3bbce27b5e15ad28d4b8b3d34c
Author: Alice (KonovalovaAA) <KonovalovaAlA@mpei.ru>
Date: Mon Mar 13 14:38:38 2023 +0300
code: вывод разности
commit f02e56655a5149c1d19cfafe2e8014b19127461e
Author: Alice (KonovalovaAA) <KonovalovaAlA@mpei.ru>
Date: Mon Mar 13 14:34:56 2023 +0300
code: вывод суммы
commit 1b4a85a93e714b9992e12a78bee0d6993febb6f6
Author: Alice (KonovalovaAA) <KonovalovaAlA@mpei.ru>
Date: Mon Mar 13 14:22:51 2023 +0300
build: add project file
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ git diff HEAD~1 HEAD~2
diff --git a/main.cpp b/main.cpp
index d8da497..6de6dd2 100644
--- a/main.cpp
+++ b/main.cpp
@@ -7,7 +7,6 @@ int main()
cout << "Enter A and B: ";
int a, b;
cin >> a >> b;
- cout << "A + B = " << a + b << '\n'
- << "A - B = " << a - b << '\n';
+ cout << "A + B = " << a + b << '\n';
return 0;
}
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ git diff HEAD~3 HEAD~1
diff --git a/main.cpp b/main.cpp
index b4392ec..d8da497 100644
--- a/main.cpp
+++ b/main.cpp
@@ -4,6 +4,10 @@ using namespace std;
int main()
{
- cout << "Hello world!" << endl;
+ cout << "Enter A and B: ";
+ int a, b;
+ cin >> a >> b;
+ cout << "A + B = " << a + b << '\n'
+ << "A - B = " << a - b << '\n';
return 0;
}
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ git show master
commit 92be9fc8d2f44f0be31ea0795c9ba7aa0c28bc1d (HEAD -> master)
Author: Alice (KonovalovaAA) <KonovalovaAlA@mpei.ru>
Date: Mon Mar 13 15:06:51 2023 +0300
git: ..
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..4c7473d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+/bin
+/obj
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ git reset --hard HEAD~1
HEAD is now at ea9094f code: вывод разности
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ git checkout HEAD -- main.cpp
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ ssh-keygen
Generating public/private rsa key pair.
Enter file in which to save the key (/c/Users/u111-09/.ssh/id_rsa):
Created directory '/c/Users/u111-09/.ssh'.
Enter passphrase (empty for no passphrase):
Enter same passphrase again:
Your identification has been saved in /c/Users/u111-09/.ssh/id_rsa.
Your public key has been saved in /c/Users/u111-09/.ssh/id_rsa.pub.
The key fingerprint is:
SHA256:Av99ec+28nof2vyPRfppym6i2YK+Ik35jaW7Mm0y3aY u111-09@PROG-29
The key's randomart image is:
+---[RSA 2048]----+
| |
| |
| . |
| o |
| + S .|
| o o o . o |
| o + O . o o..|
| . B O =oo.++O+|
| . OE*oo.+*OB%|
+----[SHA256]-----+
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ eval $(ssh-agent -s)
Agent pid 3596
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ ssh-add
Enter passphrase for /c/Users/u111-09/.ssh/id_rsa:
Identity added: /c/Users/u111-09/.ssh/id_rsa (u111-09@PROG-29)
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ cat ~/.ssh/id_rsa.pub
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDnpgTv3+0D11p2Q0sX6x2vmPqMZ954CpsViSMAQPmVatswnyck7Da26y1SB+5+tlC2NG9Dxov38n7a2MlF0e8bqZF2Fel7LxDaoRmmMg0Y4thnNX+LE7kv7e+sXq7+uPfb3cDKR7YrWTUezHvO6+hnFOhmJ0z2fZK3IsQZWPlduwTQoe3aOe86GhpjHEezK42Spw778RfrXvhGNgWbr26UhHOFAdhl/y60G/CChC5cLQ5Dx2V6aIRdWyGtIPX4csl921W3jtwfK9QREIdoZDBC4gtVydPwxxBPY5trRf6esIMKLe/2xYAHqtqbJUt1pbVtBWcswUyj/ID2lMwJL53z u111-09@PROG-29
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ git remote add origin git@uit.mpei.ru:KonovalovaAlA/cs-lab02.git
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ git push -u origin master
The authenticity of host 'uit.mpei.ru (10.1.6.13)' can't be established.
ECDSA key fingerprint is SHA256:+MRh1ssS2MjYzxp1zO+xbhzkFjtvbXFwcP0Nuzb7bD8.
Are you sure you want to continue connecting (yes/no)? yes
Warning: Permanently added 'uit.mpei.ru,10.1.6.13' (ECDSA) to the list of known hosts.
Enumerating objects: 12, done.
Counting objects: 100% (12/12), done.
Compressing objects: 100% (11/11), done.
Writing objects: 100% (12/12), 1.65 KiB | 210.00 KiB/s, done.
Total 12 (delta 1), reused 0 (delta 0)
remote: . Processing 1 references
remote: Processed 1 references in total
To uit.mpei.ru:KonovalovaAlA/cs-lab02.git
* [new branch] master -> master
Branch 'master' set up to track remote branch 'master' from 'origin'.
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ 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:KonovalovaAlA/cs-lab02
ea9094f..58189b1 master -> origin/master
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ git log --oneline --decorate --all --graph
* 58189b1 (origin/master) code: вывод произведения
* ea9094f (HEAD -> master) code: вывод разности
* f02e566 code: вывод суммы
* 1b4a85a build: add project file
* 375569d code: заготовка программы
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ git pull --f-only
error: unknown option `f-only'
usage: git pull [<options>] [<repository> [<refspec>...]]
-v, --verbose be more verbose
-q, --quiet be more quiet
--progress force progress reporting
--recurse-submodules[=<on-demand>]
control for recursive fetching of submodules
Options related to merging
-r, --rebase[=(false|true|merges|preserve|interactive)]
incorporate changes by rebasing rather than merging
-n do not show a diffstat at the end of the merge
--stat show a diffstat at the end of the merge
--log[=<n>] add (at most <n>) entries from shortlog to merge commit message
--signoff[=...] add Signed-off-by:
--squash create a single commit instead of doing a merge
--commit perform a commit if the merge succeeds (default)
--edit edit message before committing
--ff allow fast-forward
--ff-only abort if fast-forward is not possible
--verify-signatures verify that the named commit has a valid GPG signature
--autostash automatically stash/stash pop before and after rebase
-s, --strategy <strategy>
merge strategy to use
-X, --strategy-option <option=value>
option for selected merge strategy
-S, --gpg-sign[=<key-id>]
GPG sign commit
--allow-unrelated-histories
allow merging unrelated histories
Options related to fetching
--all fetch from all remotes
-a, --append append to .git/FETCH_HEAD instead of overwriting
--upload-pack <path> path to upload pack on remote end
-f, --force force overwrite of local branch
-t, --tags fetch all tags and associated objects
-p, --prune prune remote-tracking branches no longer on remote
-j, --jobs[=<n>] number of submodules pulled in parallel
--dry-run dry run
-k, --keep keep downloaded pack
--depth <depth> deepen history of shallow clone
--unshallow convert to a complete repository
--update-shallow accept refs that update .git/shallow
--refmap <refmap> specify fetch refmap
-4, --ipv4 use IPv4 addresses only
-6, --ipv6 use IPv6 addresses only
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ git add -u
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ git commit -m 'code: вывод деления'
[master 0eeb8fa] code: вывод деления
1 file changed, 3 insertions(+), 1 deletion(-)
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ git push
Enumerating objects: 5, done.
Counting objects: 100% (5/5), done.
Compressing objects: 100% (3/3), done.
Writing objects: 100% (3/3), 363 bytes | 181.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:KonovalovaAlA/cs-lab02.git
58189b1..37f4089 master -> master
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ git add -u
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ git commit -m 'code: вывод максимума'
[master 4e1efcf] code: вывод максимума
1 file changed, 7 insertions(+), 2 deletions(-)
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ git push
Enumerating objects: 5, done.
Counting objects: 100% (5/5), done.
Compressing objects: 100% (3/3), done.
Writing objects: 100% (3/3), 414 bytes | 414.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:KonovalovaAlA/cs-lab02.git
37f4089..4e1efcf master -> master
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ git log --decorate --oneline
4e1efcf (HEAD -> master, origin/master) code: вывод максимума
37f4089 code: вывод разности
58189b1 code: вывод произведения
ea9094f code: вывод разности
f02e566 code: вывод суммы
1b4a85a build: add project file
375569d code: заготовка программы
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ git branch double
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ git checkout double
Switched to branch 'double'
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (double)
$ git add -u
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (double)
$ git commit -m 'code: изменение типа переменных'
[double 8da0ebd] code: изменение типа переменных
1 file changed, 1 insertion(+), 1 deletion(-)
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (double)
$ git checkout master
Switched to branch 'master'
Your branch is up to date with 'origin/master'.
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ git push
To uit.mpei.ru:KonovalovaAlA/cs-lab02.git
! [rejected] master -> master (fetch first)
error: failed to push some refs to 'git@uit.mpei.ru:KonovalovaAlA/cs-lab02.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.
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ git pull
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:KonovalovaAlA/cs-lab02
4e1efcf..f0a1776 master -> origin/master
Updating 4e1efcf..f0a1776
Fast-forward
main.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ git log --decorate --oneline
f0a1776 (HEAD -> master, origin/master) code: вывод минимума
4e1efcf code: вывод максимума
37f4089 code: вывод деления
58189b1 code: вывод произведения
ea9094f code: вывод разности
f02e566 code: вывод суммы
1b4a85a build: add project file
375569d code: заготовка программы
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ git merge double
Auto-merging main.cpp
Merge made by the 'recursive' strategy.
main.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$ git log --decorate --oneline --all --graph
* 971ae3c (HEAD -> master) Merge branch 'double'
|\
| * 8da0ebd (double) code: изменение типа переменных
* | f0a1776 (origin/master) code: вывод минимума
|/
* 4e1efcf code: вывод максимума
* 37f4089 code: вывод деления
* 58189b1 code: вывод произведения
* ea9094f code: вывод разности
* f02e566 code: вывод суммы
* 1b4a85a build: add project file
* 375569d code: заготовка программы
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master)
$

536
lab02bob.txt
Unescape Просмотреть файл

@ -0,0 +1,536 @@
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob
$ git clone git@uit.mpei.ru:KonovalovaAlA/cs-lab02 project
Cloning into 'project'...
Enter passphrase for key '/c/Users/u111-09/.ssh/id_rsa':
remote: Enumerating objects: 12, done.
remote: Counting objects: 100% (12/12), done.
remote: Compressing objects: 100% (11/11), done.
remote: Total 12 (delta 1), reused 0 (delta 0), pack-reused 0
Receiving objects: 100% (12/12), done.
Resolving deltas: 100% (1/1), done.
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob
$
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob
$ cd project
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master)
$ git config
usage: git config [<options>]
Config file location
--global use global config file
--system use system config file
--local use repository config file
--worktree use per-worktree config file
-f, --file <file> use given config file
--blob <blob-id> read config from given blob object
Action
--get get value: name [value-regex]
--get-all get all values: key [value-regex]
--get-regexp get values for regexp: name-regex [value-regex]
--get-urlmatch get value specific for the URL: section[.var] URL
--replace-all replace all matching variables: name value [value_regex]
--add add a new variable: name value
--unset remove a variable: name [value-regex]
--unset-all remove all matches: name [value-regex]
--rename-section rename section: old-name new-name
--remove-section remove a section: name
-l, --list list all
-e, --edit open an editor
--get-color find the color configured: slot [default]
--get-colorbool find the color setting: slot [stdout-is-tty]
Type
-t, --type <> value is given this type
--bool value is "true" or "false"
--int value is decimal number
--bool-or-int value is --bool or --int
--path value is a path (file or directory name)
--expiry-date value is an expiry date
Other
-z, --null terminate values with NUL byte
--name-only show variable names only
--includes respect include directives on lookup
--show-origin show origin of config (file, standard input, blob, command line)
--default <value> with --get, use default value when missing entry
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master)
$ git commit -m 'code: âûâîä ïðîèçâåäåíèÿ'
On branch master
Your branch is up to date with 'origin/master'.
nothing to commit, working tree clean
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master)
$ git add main.cpp
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master)
$ git commit -m 'code: âûâîä ïðîèçâåäåíèÿ'
On branch master
Your branch is up to date with 'origin/master'.
nothing to commit, working tree clean
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master)
$ git commit -m 'code: âûâîä ïðîèçâåäåíèÿ'
On branch master
Your branch is up to date with 'origin/master'.
nothing to commit, working tree clean
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master)
$ git log
commit ea9094fd2f1ced3bbce27b5e15ad28d4b8b3d34c (HEAD -> master, origin/master, origin/HEAD)
Author: Alice (KonovalovaAA) <KonovalovaAlA@mpei.ru>
Date: Mon Mar 13 14:38:38 2023 +0300
code: âûâîä ðàçíîñòè
commit f02e56655a5149c1d19cfafe2e8014b19127461e
Author: Alice (KonovalovaAA) <KonovalovaAlA@mpei.ru>
Date: Mon Mar 13 14:34:56 2023 +0300
code: âûâîä ñóììû
commit 1b4a85a93e714b9992e12a78bee0d6993febb6f6
Author: Alice (KonovalovaAA) <KonovalovaAlA@mpei.ru>
Date: Mon Mar 13 14:22:51 2023 +0300
build: add project file
commit 375569df6965d47ed0e9b34b7b78a7f613970111
Author: Alice (KonovalovaAA) <KonovalovaAlA@mpei.ru>
Date: Mon Mar 13 14:19:53 2023 +0300
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master)
$ git add -u
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master)
$ git commit -m 'code: âûâîä ïðîèçâåäåíèÿ'
On branch master
Your branch is up to date with 'origin/master'.
nothing to commit, working tree clean
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master)
$ git add -u
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master)
$ git commit -m 'code: âûâîä ïðîèçâåäåíèÿ'
[master 58189b1] code: âûâîä ïðîèçâåäåíèÿ
Committer: u111-09 <u111-09@public.mpei.local>
Your name and email address were configured automatically based
on your username and hostname. Please check that they are accurate.
You can suppress this message by setting them explicitly. Run the
following command and follow the instructions in your editor to edit
your configuration file:
git config --global --edit
After doing this, you may fix the identity used for this commit with:
git commit --amend --reset-author
1 file changed, 2 insertions(+), 1 deletion(-)
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master)
$ git push
Enter passphrase for key '/c/Users/u111-09/.ssh/id_rsa':
Enumerating objects: 5, done.
Counting objects: 100% (5/5), done.
Compressing objects: 100% (3/3), done.
Writing objects: 100% (3/3), 365 bytes | 182.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:KonovalovaAlA/cs-lab02
ea9094f..58189b1 master -> master
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master)
$ git pull
Enter passphrase for key '/c/Users/u111-09/.ssh/id_rsa':
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:KonovalovaAlA/cs-lab02
58189b1..37f4089 master -> origin/master
Updating 58189b1..37f4089
Fast-forward
main.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master)
$ git log
commit 37f408941ff6633c95761a56189c9a0629f4afc5 (HEAD -> master, origin/master, origin/HEAD)
Author: Alice (KonovalovaAA) <KonovalovaAlA@mpei.ru>
Date: Mon Mar 13 16:29:56 2023 +0300
code: âûâîä äåëåíèÿ
commit 58189b1c70b56677668e485167bad74ed7c29559
Author: u111-09 <u111-09@public.mpei.local>
Date: Mon Mar 13 16:15:12 2023 +0300
code: âûâîä ïðîèçâåäåíèÿ
commit ea9094fd2f1ced3bbce27b5e15ad28d4b8b3d34c
Author: Alice (KonovalovaAA) <KonovalovaAlA@mpei.ru>
Date: Mon Mar 13 14:38:38 2023 +0300
code: âûâîä ðàçíîñòè
commit f02e56655a5149c1d19cfafe2e8014b19127461e
Author: Alice (KonovalovaAA) <KonovalovaAlA@mpei.ru>
Date: Mon Mar 13 14:34:56 2023 +0300
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master)
$ git add -u
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master)
$ git commit -m 'code: âûâîä ìèíèìóìà'
[master efb07d3] code: âûâîä ìèíèìóìà
Committer: u111-09 <u111-09@public.mpei.local>
Your name and email address were configured automatically based
on your username and hostname. Please check that they are accurate.
You can suppress this message by setting them explicitly. Run the
following command and follow the instructions in your editor to edit
your configuration file:
git config --global --edit
After doing this, you may fix the identity used for this commit with:
git commit --amend --reset-author
1 file changed, 5 insertions(+), 1 deletion(-)
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master)
$ git push
Enter passphrase for key '/c/Users/u111-09/.ssh/id_rsa':
To uit.mpei.ru:KonovalovaAlA/cs-lab02
! [rejected] master -> master (fetch first)
error: failed to push some refs to 'git@uit.mpei.ru:KonovalovaAlA/cs-lab02'
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.
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master)
$ git pull
Enter passphrase for key '/c/Users/u111-09/.ssh/id_rsa':
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:KonovalovaAlA/cs-lab02
37f4089..4e1efcf master -> origin/master
Auto-merging main.cpp
CONFLICT (content): Merge conflict in main.cpp
Automatic merge failed; fix conflicts and then commit the result.
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master|MERGING)
$ git log
commit efb07d32c5825786c5b8c39b2d7f687c03083d3b (HEAD -> master)
Author: u111-09 <u111-09@public.mpei.local>
Date: Mon Mar 13 16:49:15 2023 +0300
code: âûâîä ìèíèìóìà
commit 37f408941ff6633c95761a56189c9a0629f4afc5
Author: Alice (KonovalovaAA) <KonovalovaAlA@mpei.ru>
Date: Mon Mar 13 16:29:56 2023 +0300
code: âûâîä äåëåíèÿ
commit 58189b1c70b56677668e485167bad74ed7c29559
Author: u111-09 <u111-09@public.mpei.local>
Date: Mon Mar 13 16:15:12 2023 +0300
code: âûâîä ïðîèçâåäåíèÿ
commit ea9094fd2f1ced3bbce27b5e15ad28d4b8b3d34c
Author: Alice (KonovalovaAA) <KonovalovaAlA@mpei.ru>
Date: Mon Mar 13 14:38:38 2023 +0300
code: âûâîä ðàçíîñòè
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master|MERGING)
$ git pull
error: Pulling is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master|MERGING)
$ git log --decorate --oneline
efb07d3 (HEAD -> master) code: âûâîä ìèíèìóìà
37f4089 code: âûâîä äåëåíèÿ
58189b1 code: âûâîä ïðîèçâåäåíèÿ
ea9094f code: âûâîä ðàçíîñòè
f02e566 code: âûâîä ñóììû
1b4a85a build: add project file
375569d code: çàãîòîâêà ïðîãðàììû
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master|MERGING)
$ git pull
error: Pulling is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master|MERGING)
$ git add -u
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master|MERGING)
$ git add -u
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master|MERGING)
$ git commit -m 'code: âûâîä ìèíèìóìà'
[master a4852ff] code: âûâîä ìèíèìóìà
Committer: u111-09 <u111-09@public.mpei.local>
Your name and email address were configured automatically based
on your username and hostname. Please check that they are accurate.
You can suppress this message by setting them explicitly. Run the
following command and follow the instructions in your editor to edit
your configuration file:
git config --global --edit
After doing this, you may fix the identity used for this commit with:
git commit --amend --reset-author
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master)
$ git pull
Enter passphrase for key '/c/Users/u111-09/.ssh/id_rsa':
Already up to date.
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master)
$ git log --decorate --oneline
a4852ff (HEAD -> master) code: âûâîä ìèíèìóìà
efb07d3 code: âûâîä ìèíèìóìà
4e1efcf (origin/master, origin/HEAD) code: âûâîä ìàêñèìóìà
37f4089 code: âûâîä äåëåíèÿ
58189b1 code: âûâîä ïðîèçâåäåíèÿ
ea9094f code: âûâîä ðàçíîñòè
f02e566 code: âûâîä ñóììû
1b4a85a build: add project file
375569d code: çàãîòîâêà ïðîãðàììû
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master)
$ git reset --hard efb07d3
HEAD is now at efb07d3 code: âûâîä ìèíèìóìà
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master)
$ git log --decorate --oneline
efb07d3 (HEAD -> master) code: âûâîä ìèíèìóìà
37f4089 code: âûâîä äåëåíèÿ
58189b1 code: âûâîä ïðîèçâåäåíèÿ
ea9094f code: âûâîä ðàçíîñòè
f02e566 code: âûâîä ñóììû
1b4a85a build: add project file
375569d code: çàãîòîâêà ïðîãðàììû
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master)
$ git reset --hard 37f4089
HEAD is now at 37f4089 code: âûâîä äåëåíèÿ
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master)
$ git log --decorate --oneline
37f4089 (HEAD -> master) code: âûâîä äåëåíèÿ
58189b1 code: âûâîä ïðîèçâåäåíèÿ
ea9094f code: âûâîä ðàçíîñòè
f02e566 code: âûâîä ñóììû
1b4a85a build: add project file
375569d code: çàãîòîâêà ïðîãðàììû
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master)
$ git pull
Enter passphrase for key '/c/Users/u111-09/.ssh/id_rsa':
Updating 37f4089..4e1efcf
Fast-forward
main.cpp | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master)
$ git log --decorate --oneline
4e1efcf (HEAD -> master, origin/master, origin/HEAD) code: âûâîä ìàêñèìóìà
37f4089 code: âûâîä äåëåíèÿ
58189b1 code: âûâîä ïðîèçâåäåíèÿ
ea9094f code: âûâîä ðàçíîñòè
f02e566 code: âûâîä ñóììû
1b4a85a build: add project file
375569d code: çàãîòîâêà ïðîãðàììû
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master)
$ git add -u
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master)
$ git commit -m 'code: âûâîä ìèíèìóìà'
On branch master
Your branch is up to date with 'origin/master'.
nothing to commit, working tree clean
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master)
$ git log --decorate --oneline
4e1efcf (HEAD -> master, origin/master, origin/HEAD) code: âûâîä ìàêñèìóìà
37f4089 code: âûâîä äåëåíèÿ
58189b1 code: âûâîä ïðîèçâåäåíèÿ
ea9094f code: âûâîä ðàçíîñòè
f02e566 code: âûâîä ñóììû
1b4a85a build: add project file
375569d code: çàãîòîâêà ïðîãðàììû
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master)
$ git reset --hard 37f4089
HEAD is now at 37f4089 code: âûâîä äåëåíèÿ
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master)
$ git log --decorate --oneline
37f4089 (HEAD -> master) code: âûâîä äåëåíèÿ
58189b1 code: âûâîä ïðîèçâåäåíèÿ
ea9094f code: âûâîä ðàçíîñòè
f02e566 code: âûâîä ñóììû
1b4a85a build: add project file
375569d code: çàãîòîâêà ïðîãðàììû
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master)
$ git add -u
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master)
$ git commit -m 'code: âûâîä ìèíèìóìà'
On branch master
Your branch is behind 'origin/master' by 1 commit, and can be fast-forwarded.
(use "git pull" to update your local branch)
nothing to commit, working tree clean
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master)
$ git log --decorate --oneline
37f4089 (HEAD -> master) code: âûâîä äåëåíèÿ
58189b1 code: âûâîä ïðîèçâåäåíèÿ
ea9094f code: âûâîä ðàçíîñòè
f02e566 code: âûâîä ñóììû
1b4a85a build: add project file
375569d code: çàãîòîâêà ïðîãðàììû
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master)
$ git add -u
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master)
$ git commit -m 'code: âûâîä ìèíèìóìà'
On branch master
Your branch is behind 'origin/master' by 1 commit, and can be fast-forwarded.
(use "git pull" to update your local branch)
nothing to commit, working tree clean
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master)
$ git pull
Enter passphrase for key '/c/Users/u111-09/.ssh/id_rsa':
Updating 37f4089..4e1efcf
Fast-forward
main.cpp | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master)
$ git log --decorate --oneline
4e1efcf (HEAD -> master, origin/master, origin/HEAD) code: âûâîä ìàêñèìóìà
37f4089 code: âûâîä äåëåíèÿ
58189b1 code: âûâîä ïðîèçâåäåíèÿ
ea9094f code: âûâîä ðàçíîñòè
f02e566 code: âûâîä ñóììû
1b4a85a build: add project file
375569d code: çàãîòîâêà ïðîãðàììû
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master)
$ git add -u
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master)
$ git commit -m 'code: âûâîä ìèíèìóìà'
On branch master
Your branch is up to date with 'origin/master'.
nothing to commit, working tree clean
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master)
$ git rebase origin/master
Current branch master is up to date.
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master)
$ git log --decorate --oneline
4e1efcf (HEAD -> master, origin/master, origin/HEAD) code: âûâîä ìàêñèìóìà
37f4089 code: âûâîä äåëåíèÿ
58189b1 code: âûâîä ïðîèçâåäåíèÿ
ea9094f code: âûâîä ðàçíîñòè
f02e566 code: âûâîä ñóììû
1b4a85a build: add project file
375569d code: çàãîòîâêà ïðîãðàììû
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master)
$ git add -u
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master)
$ git commit -m 'code: âûâîä ìèíèìóìà'
[master f0a1776] code: âûâîä ìèíèìóìà
Committer: u111-09 <u111-09@public.mpei.local>
Your name and email address were configured automatically based
on your username and hostname. Please check that they are accurate.
You can suppress this message by setting them explicitly. Run the
following command and follow the instructions in your editor to edit
your configuration file:
git config --global --edit
After doing this, you may fix the identity used for this commit with:
git commit --amend --reset-author
1 file changed, 2 insertions(+), 1 deletion(-)
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master)
$ git rebase origin/master
Current branch master is up to date.
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master)
$ git log --decorate --oneline
f0a1776 (HEAD -> master) code: âûâîä ìèíèìóìà
4e1efcf (origin/master, origin/HEAD) code: âûâîä ìàêñèìóìà
37f4089 code: âûâîä äåëåíèÿ
58189b1 code: âûâîä ïðîèçâåäåíèÿ
ea9094f code: âûâîä ðàçíîñòè
f02e566 code: âûâîä ñóììû
1b4a85a build: add project file
375569d code: çàãîòîâêà ïðîãðàììû
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master)
$ git push
Enter passphrase for key '/c/Users/u111-09/.ssh/id_rsa':
Enumerating objects: 5, done.
Counting objects: 100% (5/5), done.
Compressing objects: 100% (3/3), done.
Writing objects: 100% (3/3), 356 bytes | 356.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:KonovalovaAlA/cs-lab02
4e1efcf..f0a1776 master -> master
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master)
$
Редактирование Предпросмотр
Загрузка…
Отмена
Сохранить