aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02
$ mkdir alice

aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02
$ mkdir bob

aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02
$ cd alice

aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/alice
$ mkdir project

aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/alice
$ cd project

aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/alice/project
$ cd ..

aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/alice
$ cd project

aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/alice/project
$ git init
Initialized empty Git repository in C:/Users/aulov/Desktop/lab02/alice/project/.git/

aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/alice/project (master)
$ git config user.name 'Alice(AulovaAV)'

aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/alice/project (master)
$ git config user.email 'AulovaAV@mpei.ru'

aulov@DESKTOP-AA9LOVM MINGW64 ~/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) //(используйте “git add”, чтобы включить то, что будет закоммичено)
        bin/
        main.cpp
        obj/
        project.cbp

nothing added to commit but untracked files present (use "git add" to track) //ничего не добавлено, чтобы коммитить, присутствуют неотслеживаемые файлы (используйте "git add", чтобы отслеживать их)

aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/alice/project (master)
$ git add main.cpp

aulov@DESKTOP-AA9LOVM MINGW64 ~/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//новый файл main

Untracked files:
  (use "git add <file>..." to include in what will be committed)
        bin/
        obj/
        project.cbp


aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/alice/project (master)
$ git commit -m 'code: заготовка программы'
[master (root-commit) fb80f5e] code: заготовка программы
 1 file changed, 9 insertions(+)
 create mode 100644 main.cpp

aulov@DESKTOP-AA9LOVM MINGW64 ~/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 restore <file>..." to discard changes in working directory)
        modified:   main.cpp//изменен main 

Untracked files://неотслеживаемые файлы 
  (use "git add <file>..." to include in what will be committed)
        bin/
        obj/
        project.cbp

no changes added to commit (use "git add" and/or "git commit -a")
aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/alice/project (master)
$ git add main.cpp

aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/alice/project (master)
$ git commit -m "ввод чисел"
[master 95b7a85] ввод чисел
 1 file changed, 3 insertions(+), 2 deletions(-)

aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/alice/project (master)
$ git add -u

aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/alice/project (master)
$ git commit -m "вывод суммы'
> "
[master 93764fe] вывод суммы'
 1 file changed, 1 insertion(+)

aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/alice/project (master)
$ git commit -a -m "вывод суммы и разности"
[master 3a1f3e2] вывод суммы и разности
 1 file changed, 1 insertion(+), 1 deletion(-)

aulov@DESKTOP-AA9LOVM MINGW64 ~/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/
        project.cbp
        project.depend

nothing added to commit but untracked files present (use "git add" to track)

aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/alice/project (master)
$ git status
On branch master
Untracked files:
  (use "git add <file>..." to include in what will be committed)
        .gitignore
        project.cbp
        project.depend

nothing added to commit but untracked files present (use "git add" to track)

aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/alice/project (master)
$ git add .gitignore

aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/alice/project (master)
$ git commit -m 'git'
[master bf12392] git
 1 file changed, 2 insertions(+)
 create mode 100644 .gitignore

aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/alice/project (master)
$ git log
commit bf123923eb68f4f3ad331d195d486742cf943ae9 (HEAD -> master)
Author: Alice(AulovaAV) <AulovaAV@mpei.ru>
Date:   Sat May 13 18:42:16 2023 +0300

    git

commit 3a1f3e25201d766006a4b3d8245f87439373d53b
Author: Alice(AulovaAV) <AulovaAV@mpei.ru>
Date:   Sat May 13 18:36:13 2023 +0300

    вывод суммы и разности

commit 93764fec7a80be1b5e9b55da86f31f0d008a32ea
Author: Alice(AulovaAV) <AulovaAV@mpei.ru>
Date:   Sat May 13 18:35:15 2023 +0300

    вывод суммы'

commit 95b7a85248b7b4ece21dc0e2847bdad756186b52
Author: Alice(AulovaAV) <AulovaAV@mpei.ru>
Date:   Sat May 13 18:16:36 2023 +0300

    ввод чисел
:
aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/alice/project (master)
$ git log --stat
commit bf123923eb68f4f3ad331d195d486742cf943ae9 (HEAD -> master)//хэш коммита
Author: Alice(AulovaAV) <AulovaAV@mpei.ru>//автор коммита
Date:   Sat May 13 18:42:16 2023 +0300/дата и время 

    git

 .gitignore | 2 ++//две вставки 
 1 file changed, 2 insertions(+)// 1 файл изменен, 2 вставки 

commit 3a1f3e25201d766006a4b3d8245f87439373d53b
Author: Alice(AulovaAV) <AulovaAV@mpei.ru>
Date:   Sat May 13 18:36:13 2023 +0300

    вывод суммы и разности

 main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 93764fec7a80be1b5e9b55da86f31f0d008a32ea
Author: Alice(AulovaAV) <AulovaAV@mpei.ru>
Date:   Sat May 13 18:35:15 2023 +0300

    вывод суммы'
:
aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/alice/project (master)
$ git log --oneline --decorate
bf12392 (HEAD -> master) git
3a1f3e2 вывод суммы и разности
93764fe вывод суммы'
95b7a85 ввод чисел
fb80f5e code: заготовка программы

aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/alice/project (master)
$ git log --oneline --decorate --all --graph
* bf12392 (HEAD -> master) git
* 3a1f3e2 вывод суммы и разности
* 93764fe вывод суммы'
* 95b7a85 ввод чисел
* fb80f5e code: заготовка программы

aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/alice/project (master)
$ git add project.cbp
warning: in the working copy of 'project.cbp', LF will be replaced by CRLF the next time Git touches it

aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/alice/project (master)
$ git commit -m 'build: add project file'
[master f885aee] build: add project file
 1 file changed, 40 insertions(+)
 create mode 100644 project.cbp

aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/alice/project (master)
$ git log --grep 'build:'
commit f885aee1e92afc9e6ac127d3cd5a3c76129f6969 (HEAD -> master)
Author: Alice(AulovaAV) <AulovaAV@mpei.ru>
Date:   Sat May 13 19:03:35 2023 +0300

    build: add project file

aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/alice/project (master)
$ git log -- project.cbp
commit f885aee1e92afc9e6ac127d3cd5a3c76129f6969 (HEAD -> master)
Author: Alice(AulovaAV) <AulovaAV@mpei.ru>
Date:   Sat May 13 19:03:35 2023 +0300

    build: add project file

aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/alice/project (master)
$ git show HEAD~2
commit 3a1f3e25201d766006a4b3d8245f87439373d53b//хэш коммита
Author: Alice(AulovaAV) <AulovaAV@mpei.ru>/автор
Date:   Sat May 13 18:36:13 2023 +0300//дата и время 

    вывод суммы и разности//комментарий к коммиту

diff --git a/main.cpp b/main.cpp//просмотр различий между коммитами 
index 800d68c..d9dd43e 100644//индекс
--- a/main.cpp//заголовок
+++ b/main.cpp//заголовок
@@ -7,5 +7,5 @@ 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';//добавленная строка
 } //контекст 


aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/alice/project (master)
$ git show master
commit 3a1f3e25201d766006a4b3d8245f87439373d53b
Author: Alice(AulovaAV) <AulovaAV@mpei.ru>
Date:   Sat May 13 18:36:13 2023 +0300

    вывод суммы и разности

diff --git a/main.cpp b/main.cpp
index 800d68c..d9dd43e 100644
--- a/main.cpp
+++ b/main.cpp
@@ -7,5 +7,5 @@ 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';
 }



aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/alice/project (master)
$ git show 3a1f3e25
commit 3a1f3e25201d766006a4b3d8245f87439373d53b
Author: Alice(AulovaAV) <AulovaAV@mpei.ru>
Date:   Sat May 13 18:36:13 2023 +0300

    вывод суммы и разности

diff --git a/main.cpp b/main.cpp
index 800d68c..d9dd43e 100644
--- a/main.cpp
+++ b/main.cpp
@@ -7,5 +7,5 @@ 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';
 }

aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/alice/project (master)
$ git diff
diff --git a/main.cpp b/main.cpp //просмотр различий между версиями
index d9dd43e..85d3b98 100644
--- a/main.cpp
+++ b/main.cpp
@@ -7,5 +7,5 @@ int main() //обозначение места изменений в файле, измененная функция int
    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'<< "A - B = " << a - b << '\n'<< "A * B = "<< a*b<<'\n';//добавленная строка
 }

aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/alice/project (master)
$ git diff fb80f5e 3a1f3e2
diff --git a/main.cpp b/main.cpp
index b4392ec..d9dd43e 100644
--- a/main.cpp
+++ b/main.cpp
@@ -4,6 +4,8 @@ using namespace std;

 int main()
 {
-    cout << "Hello world!" << endl;
-    return 0;
+   cout << "Enter A and B: ";
+int a, b;
+cin >> a >> b;
+cout << "A + B = " << a + b << '\n'<< "A - B = " << a - b << '\n';
 }

Выберем файл, изменение которого должно войти в коммит
aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/alice/project (master)
$ git add main.cpp


Сделаем коммит 
aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/alice/project (master)
$ git commit -m 'Вывод произведения'
[master b4aa825] Вывод произведения
 1 file changed, 1 insertion(+), 1 deletion(-)

aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/alice/project (master)
$ git reset --hard HEAD~1
HEAD is now at f885aee build: add project file

aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/alice/project (master)
$ git checkout HEAD -- main.cpp

aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/alice/project (master)
$ ssh-keygen
Generating public/private rsa key pair.
Enter file in which to save the key (/c/Users/aulov/.ssh/id_rsa):

aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/alice/project (master)
$ ssh=keygen

aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/alice/project (master)
$ ssh-keygen
Generating public/private rsa key pair.
Enter file in which to save the key (/c/Users/aulov/.ssh/id_rsa):
Created directory '/c/Users/aulov/.ssh'.
Enter passphrase (empty for no passphrase):
Enter same passphrase again:
Passphrases do not match.  Try again.
Enter passphrase (empty for no passphrase):
Enter same passphrase again:
Passphrases do not match.  Try again.
Enter passphrase (empty for no passphrase):
Enter same passphrase again:
Your identification has been saved in /c/Users/aulov/.ssh/id_rsa
Your public key has been saved in /c/Users/aulov/.ssh/id_rsa.pub
The key fingerprint is:
SHA256:tEf09thTayq+h56qMj4W3eq5OQl6/FVssSr6NV1iCg0 aulov@DESKTOP-AA9LOVM
The key's randomart image is:
+---[RSA 3072]----+
|          .      |
|         . .     |
|       E. ..o   .|
|       .oo..o+ ..|
|      ..S..B..+o |
|     o ..oB o o. |
|    o o.o* o..   |
|   . B.+* o.o.   |
|    +oBO+.o=o    |
+----[SHA256]-----+

aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/alice/project (master)
$ eval $(ssh-agent -s)
Agent pid 2183

aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/alice/project (master)
$ ssh-add
Enter passphrase for /c/Users/aulov/.ssh/id_rsa:
Identity added: /c/Users/aulov/.ssh/id_rsa (aulov@DESKTOP-AA9LOVM)

aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/alice/project (master)
$ cat ~/.ssh/id_rsa.pub
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQD7C2j1YHYWZTX3bR7uhj8ZxyfRqI7cHYW5dQFoCkxKN9ldFIpQIJb9veKjDiHQ9XlmZD7r0Vavvk6hNrDciJHzjhfr45GH3YA/93WhA1PbtecKOQmzM0ZHFVS/wq54YBFddGdxDKCQPT0Z1i1ilVR1ew5aMwSAVfUz6NmNqiwIgJam0qtHqVZSooT/W1pT6PrtB5OCQ0ZGc07BhPEbSXsoMrp1oyz6CUsZAY/4WQZKruT3OpqLSJicD38spbVMzVSzkzOtrAk7sr4sw03WGYXd/NdKUnalb57n2FV00l120eYhuW9O3g5ysux2HADv9MqiZI7XkQuDq8iu49hVHq1m6VJo5nyj5EGwE1ysdhmPhLAE5sK/yS4UJOpb4U3MNuwYCpL5X76cq6DTHtl1i4zRu21nif5yAUSztA7fzhk6WinFZhSX9SBwFSQcoOVWf74N2dSUVwwdV3VyFxsNQSt76/mC/IbYRZ2sB0AcHM5z8jAtpkuBA81J2dAUg6oWwNM= aulov@DESKTOP-AA9LOVM

aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/alice/project (master)
$ git remote set-url origin http://uit.mpei.ru/git/AulovaAV/cs-lab02.git

aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/alice/project (master)
$ git remote -v
origin  http://uit.mpei.ru/git/AulovaAV/cs-lab02.git (fetch)
origin  http://uit.mpei.ru/git/AulovaAV/cs-lab02.git (push)

aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/alice/project (master)
$ git push -u origin master
warning: auto-detection of host provider took too long (>2000ms)
warning: see https://aka.ms/gcm/autodetect for more information.
Enumerating objects: 18, done.
Counting objects: 100% (18/18), done.
Delta compression using up to 4 threads
Compressing objects: 100% (13/13), done.
Writing objects: 100% (18/18), 2.00 KiB | 510.00 KiB/s, done.
Total 18 (delta 3), reused 0 (delta 0), pack-reused 0
remote: . Processing 1 references
remote: Processed 1 references in total
To http://uit.mpei.ru/git/AulovaAV/cs-lab02.git
 * [new branch]      master -> master
branch 'master' set up to track 'origin/master'.

aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/alice/project (master)
$ git fetch

aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/alice/project (master)
$ git log --oneline --decorate --all --graph
* f885aee (HEAD -> master, origin/master) build: add project file
* bf12392 git
* 3a1f3e2 вывод суммы и разности
* 93764fe вывод суммы'
* 95b7a85 ввод чисел
* fb80f5e code: заготовка программы

aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/alice/project (master)
$ git log --oneline --decorate --all --graph
* f885aee (HEAD -> master, origin/master) build: add project file
* bf12392 git
* 3a1f3e2 вывод суммы и разности
* 93764fe вывод суммы'
* 95b7a85 ввод чисел
* fb80f5e code: заготовка программы

aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/alice/project (master)
$ git pull --ff-only
Already up to date.

aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/alice/project (master)
$ git fetch

aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/alice/project (master)
$ git log --oneline --decorate --all --graph
* f885aee (HEAD -> master, origin/master) build: add project file
* bf12392 git
* 3a1f3e2 вывод суммы и разности
* 93764fe вывод суммы'
* 95b7a85 ввод чисел
* fb80f5e code: заготовка программы

aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/alice/project (master)
$ git add main.cpp

aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/alice/project (master)
$ git commit -m'code: вывод деления'
[master 8001485] code: вывод деления
 1 file changed, 4 insertions(+), 1 deletion(-)

aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/alice/project (master)
$ git push
Enumerating objects: 5, done.
Counting objects: 100% (5/5), done.
Delta compression using up to 4 threads
Compressing objects: 100% (3/3), done.
Writing objects: 100% (3/3), 483 bytes | 483.00 KiB/s, done.
Total 3 (delta 0), reused 0 (delta 0), pack-reused 0
remote: . Processing 1 references
remote: Processed 1 references in total
To http://uit.mpei.ru/git/AulovaAV/cs-lab02.git
   f885aee..8001485  master -> master

aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/alice/project (master)
$ git log --oneline --decorate --all --graph
* 8001485 (HEAD -> master, origin/master) code: вывод деления
* f885aee build: add project file
* bf12392 git
* 3a1f3e2 вывод суммы и разности
* 93764fe вывод суммы'
* 95b7a85 ввод чисел
* fb80f5e code: заготовка программы

u111-12@PROG-09 MINGW32 ~/Desktop/lab02/alice/project (master)                  
$ git add main.cpp                                                              
                                                                                
u111-12@PROG-09 MINGW32 ~/Desktop/lab02/alice/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-12@PROG-09 MINGW32 ~/Desktop/lab02/alice/project (master)                  
$ git add main.cpp                                                              
                                                                                
u111-12@PROG-09 MINGW32 ~/Desktop/lab02/alice/project (master)                  
$ git commit -m'code:деление'                                                   
[master 16ac518] code:деление                                                   
 Committer: u111-12                                  
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, 1 insertion(+), 1 deletion(-)                                  
                                                                                
u111-12@PROG-09 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), 375 bytes | 187.00 KiB/s, done.                    
Total 3 (delta 1), reused 0 (delta 0)                                           
remote: . Processing 1 references                                               
remote: Processed 1 references in total                                         
To http://uit.mpei.ru/git/AulovaAV/cs-lab02.git                                 
   8001485..16ac518  master -> master                                           
                                                                                
u111-12@PROG-09 MINGW32 ~/Desktop/lab02/alice/project (master)                  
$ git log --oneline --decorate --all --graph                                    
* 16ac518 (HEAD -> master, origin/master, origin/HEAD) code:деление             
* 8001485 code: вывод деления                                                   
* f885aee build: add project file                                               
* bf12392 git                                                                   
* 3a1f3e2 вывод суммы и разности                                                
* 93764fe вывод суммы'                                                          
* 95b7a85 ввод чисел                                                            
* fb80f5e code: заготовка программы                                             
                                                                                
u111-12@PROG-09 MINGW32 ~/Desktop/lab02/alice/project (master)                  
$ git pull --ff-only                                                            
Already up to date.                                                             
                                                                                
u111-12@PROG-09 MINGW32 ~/Desktop/lab02/alice/project (master)                  
$ git push                                                                      
Everything up-to-date                                                           
                                                                                
u111-12@PROG-09 MINGW32 ~/Desktop/lab02/alice/project (master)                  
$ git log --oneline --decorate --all --graph                                    
* 16ac518 (HEAD -> master, origin/master, origin/HEAD) code:деление             
* 8001485 code: вывод деления                                                   
* f885aee build: add project file                                               
* bf12392 git                                                                   
* 3a1f3e2 вывод суммы и разности                                                
* 93764fe вывод суммы'                                                          
* 95b7a85 ввод чисел                                                            
* fb80f5e code: заготовка программы                                             
                                                                                
u111-12@PROG-09 MINGW32 ~/Desktop/lab02/alice/project (master)                  
$ git add main.cpp                                                              
                                                                                
u111-12@PROG-09 MINGW32 ~/Desktop/lab02/alice/project (master)                  
$ git commit -m'code: вывод максимума'                                          
[master 69ff4fb] code: вывод максимума                                          
 Committer: u111-12                                  
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, 7 insertions(+)                                                
                                                                                
u111-12@PROG-09 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), 411 bytes | 205.00 KiB/s, done.                    
Total 3 (delta 1), reused 0 (delta 0)                                           
remote: . Processing 1 references                                               
remote: Processed 1 references in total                                         
To http://uit.mpei.ru/git/AulovaAV/cs-lab02.git                                 
   16ac518..69ff4fb  master -> master                                           
u111-12@PROG-09 MINGW32 ~/Desktop/lab02/alice/project (master)                                              
$ git branch double                                                                                         
                                                                                                            
u111-12@PROG-09 MINGW32 ~/Desktop/lab02/alice/project (master)                                              
$ git checkout double                                                                                       
Switched to branch 'double'                                                                                 
                                                                                                            
u111-12@PROG-09 MINGW32 ~/Desktop/lab02/alice/project (double)                                              
$ git add main.cpp                                                                                          
                                                                                                            
u111-12@PROG-09 MINGW32 ~/Desktop/lab02/alice/project (double)                                              
$ git commit -m'code: double'                                                                               
[double f6de765] code: double                                                                               
 Committer: u111-12                                                              
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, 1 insertion(+), 1 deletion(-)                                                              
                                                                                                            
u111-12@PROG-09 MINGW32 ~/Desktop/lab02/alice/project (double)                                              
$ git checkout master                                                                                       
Switched to branch 'master'                                                                                 
Your branch is up to date with 'origin/master'.                                                             
                                                                                                            
u111-12@PROG-09 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 http://uit.mpei.ru/git/AulovaAV/cs-lab02                                                               
   69ff4fb..08fd3a9  master     -> origin/master                                                            
                                                                                                            
u111-12@PROG-09 MINGW32 ~/Desktop/lab02/alice/project (master)                                              
$ git log --oneline --decorate --all --graph                                                                
* f6de765 (double) code: double                                                                             
| * 08fd3a9 (origin/master, origin/HEAD) code: вывод минимума                                               
|/                                                                                                          
* 69ff4fb (HEAD -> master) code: вывод максимума                                                            
* 16ac518 code:деление                                                                                      
* 8001485 code: вывод деления                                                                               
* f885aee build: add project file                                                                           
* bf12392 git                                                                                               
* 3a1f3e2 вывод суммы и разности                                                                            
* 93764fe вывод суммы'                                                                                      
* 95b7a85 ввод чисел                                                                                        
* fb80f5e code: заготовка программы                                                                         
                                                                                                            
u111-12@PROG-09 MINGW32 ~/Desktop/lab02/alice/project (master)                                              
$ git merge double                                                                                          
Updating 69ff4fb..f6de765                                                                                   
Fast-forward                                                                                                
 main.cpp | 2 +-                                                                                            
 1 file changed, 1 insertion(+), 1 deletion(-)                                                              
                                                                                                            
u111-12@PROG-09 MINGW32 ~/Desktop/lab02/alice/project (master)                                              
$ git push                                                                                                  
To http://uit.mpei.ru/git/AulovaAV/cs-lab02.git                                                             
 ! [rejected]        master -> master (non-fast-forward)                                                    
error: failed to push some refs to 'http://uit.mpei.ru/git/AulovaAV/cs-lab02.git                            
'                                                                                                           
hint: Updates were rejected because the tip of your current branch is behind                                
hint: its remote counterpart. Integrate the remote changes (e.g.                                            
hint: 'git pull ...') before pushing again.                                                                 
hint: See the 'Note about fast-forwards' in 'git push --help' for details.                                  
                                                                                                            
u111-12@PROG-09 MINGW32 ~/Desktop/lab02/alice/project (master)                                              
$ git push                                                                                                  
To http://uit.mpei.ru/git/AulovaAV/cs-lab02.git                                                             
 ! [rejected]        master -> master (non-fast-forward)                                                    
error: failed to push some refs to 'http://uit.mpei.ru/git/AulovaAV/cs-lab02.git                            
'                                                                                                           
hint: Updates were rejected because the tip of your current branch is behind                                
hint: its remote counterpart. Integrate the remote changes (e.g.                                            
hint: 'git pull ...') before pushing again.                                                                 
hint: See the 'Note about fast-forwards' in 'git push --help' for details.                                  
                                                                                                            
u111-12@PROG-09 MINGW32 ~/Desktop/lab02/alice/project (master)                                              
$ git add main.cpp                                                                                          
                                                                                                            
u111-12@PROG-09 MINGW32 ~/Desktop/lab02/alice/project (master)                                              
$ git log --all --oneline --decorate --graph                                                                
* f6de765 (HEAD -> master, double) code: double                                                             
| * 08fd3a9 (origin/master, origin/HEAD) code: вывод минимума                                               
|/                                                                                                          
* 69ff4fb code: вывод максимума                                                                             
* 16ac518 code:деление                                                                                      
* 8001485 code: вывод деления                                                                               
* f885aee build: add project file                                                                           
* bf12392 git                                                                                               
* 3a1f3e2 вывод суммы и разности                                                                            
* 93764fe вывод суммы'                                                                                      
* 95b7a85 ввод чисел                                                                                        
* fb80f5e code: заготовка программы                                                                         
                                                                                                            
u111-12@PROG-09 MINGW32 ~/Desktop/lab02/alice/project (master)                                              
$ git reset --hard HEAD~1                                                                                   
HEAD is now at 69ff4fb code: вывод максимума                                                                
                                                                                                            
u111-12@PROG-09 MINGW32 ~/Desktop/lab02/alice/project (master)                                              
$ git log --all --oneline --decorate --graph                                                                
* f6de765 (double) code: double                                                                             
| * 08fd3a9 (origin/master, origin/HEAD) code: вывод минимума                                               
|/                                                                                                          
* 69ff4fb (HEAD -> master) code: вывод максимума                                                            
* 16ac518 code:деление                                                                                      
* 8001485 code: вывод деления                                                                               
* f885aee build: add project file                                                                           
* bf12392 git                                                                                               
* 3a1f3e2 вывод суммы и разности                                                                            
* 93764fe вывод суммы'                                                                                      
* 95b7a85 ввод чисел                                                                                        
* fb80f5e code: заготовка программы                                                                         
                                                                                                            
u111-12@PROG-09 MINGW32 ~/Desktop/lab02/alice/project (master)                                              
$ git pull                                                                                                  
Updating 69ff4fb..08fd3a9                                                                                   
Fast-forward                                                                                                
 main.cpp | 12 ++++++++++--                                                                                 
 1 file changed, 10 insertions(+), 2 deletions(-)                                                           
                                                                                                            
u111-12@PROG-09 MINGW32 ~/Desktop/lab02/alice/project (master)                                              
$ git log --all --oneline --decorate --graph                                                                
* f6de765 (double) code: double                                                                             
| * 08fd3a9 (HEAD -> master, origin/master, origin/HEAD) code: вывод минимума                               
|/                                                                                                          
* 69ff4fb code: вывод максимума                                                                             
* 16ac518 code:деление                                                                                      
* 8001485 code: вывод деления                                                                               
* f885aee build: add project file                                                                           
* bf12392 git                                                                                               
* 3a1f3e2 вывод суммы и разности                                                                            
* 93764fe вывод суммы'                                                                                      
Merge made by the 'recursive' strategy.                                                                     
 main.cpp | 2 +-                                                                                            
 1 file changed, 1 insertion(+), 1 deletion(-)                                                              
                                                                                                            
u111-12@PROG-09 MINGW32 ~/Desktop/lab02/alice/project (master)                                              
$ git push                                                                                                  
Enumerating objects: 10, done.                                                                              
Counting objects: 100% (10/10), done.                                                                       
Compressing objects: 100% (6/6), done.                                                                      
Writing objects: 100% (6/6), 684 bytes | 228.00 KiB/s, done.                                                
Total 6 (delta 2), reused 0 (delta 0)                                                                       
remote: . Processing 1 references                                                                           
remote: Processed 1 references in total                                                                     
To http://uit.mpei.ru/git/AulovaAV/cs-lab02.git                                                             
   08fd3a9..244804a  master -> master                                                                       
                                                                                                            
u111-12@PROG-09 MINGW32 ~/Desktop/lab02/alice/project (master)                                              
$ git log --oneline --decorate --all --graph                                                                
*   244804a (HEAD -> master, origin/master, origin/HEAD) Merge branch 'double'                              
|\                                                                                                          
| * f6de765 (double) code: double                                                                           
* | 08fd3a9 code: вывод минимума                                                                            
|/                                                                                                          
* 69ff4fb code: вывод максимума                                                                             
* 16ac518 code:деление                                                                                      
* 8001485 code: вывод деления                                                                               
* f885aee build: add project file                                                                           
* bf12392 git                                                                                               
* 3a1f3e2 вывод суммы и разности                                                                            
* 93764fe вывод суммы'                                                                                      
* 95b7a85 ввод чисел                                                                                        
* fb80f5e code: заготовка программы