Родитель
63c7f6ab35
Сommit
a5cc49ead7
@ -0,0 +1,599 @@
|
|||||||
|
Îò÷åò ïî ëàáîðàòîðíîé ðàáîòå ¹ 2 "Ñèñòåìà êîíòðîëÿ âåðñèé Git"
|
||||||
|
|
||||||
|
Âûïîëíèë: Ìîâñèñÿí Ð.Ã.
|
||||||
|
Ãðóïïà: À-03-23
|
||||||
|
Ïðîâåðèë:
|
||||||
|
|
||||||
|
Ïðèìå÷àíèå: ðàáîòà âûïîëíÿëàñü íà Windows.
|
||||||
|
|
||||||
|
1. Ñîçäàë íà ðàáî÷åì ñòîëå êàòàëîã lab02 è çàïóñòèë â íåì Git Bash, ïðèãëàøåíèå:
|
||||||
|
|
||||||
|
u113-13@PROG-29 MINGW32 ~/Desktop/lab02
|
||||||
|
$
|
||||||
|
|
||||||
|
|
||||||
|
2. Ïðîñìîòðåë ôàéëû â ðàáî÷åì êàòàëîãå ìîæíî êîìàíäîé "ls" --- ïóñòî:
|
||||||
|
|
||||||
|
u113-13@PROG-29 MINGW32 ~/Desktop/lab02
|
||||||
|
$ ls
|
||||||
|
u113-13@PROG-29 MINGW32 ~/Desktop/lab02
|
||||||
|
$
|
||||||
|
|
||||||
|
|
||||||
|
3. Ñîçäàë êàòàëîãè Àëèñû è Áîáà, ñîçäàë êàòàëîã "project",
|
||||||
|
èçó÷èë êîìàíäó "cd" â ïðîöåññå:
|
||||||
|
|
||||||
|
u113-13@PROG-29 MINGW32 ~/Desktop/lab02
|
||||||
|
$ mkdir alice
|
||||||
|
|
||||||
|
u113-13@PROG-29 MINGW32 ~/Desktop/lab02
|
||||||
|
$ mkdir bob
|
||||||
|
|
||||||
|
u113-13@PROG-29 MINGW32 ~/Desktop/lab02
|
||||||
|
$ cd bob
|
||||||
|
|
||||||
|
u113-13@PROG-29 MINGW32 ~/Desktop/lab02/bob
|
||||||
|
$ cd ..
|
||||||
|
|
||||||
|
u113-13@PROG-29 MINGW32 ~/Desktop/lab02
|
||||||
|
$ cd alice
|
||||||
|
|
||||||
|
u113-13@PROG-29 MINGW32 ~/Desktop/lab02/alice
|
||||||
|
$ mkdir project
|
||||||
|
|
||||||
|
u113-13@PROG-29 MINGW32 ~/Desktop/lab02/alice
|
||||||
|
$ ls
|
||||||
|
project
|
||||||
|
|
||||||
|
u113-13@PROG-29 MINGW32 ~/Desktop/lab02/alice
|
||||||
|
$ cd project
|
||||||
|
|
||||||
|
4. Èíèöèàëèçèðîâàë ðåïîçèòàðèé, Äîáàâèë ñâîè äàííûå, ïåðåèìåíîâàòü èìÿ âåòêè íå ïîëó÷èëîñü(ñäåëàþ ïîñëå ñîçäàíèÿ) ïåðâîãî êîììèòà
|
||||||
|
|
||||||
|
u113-13@PROG-23 MINGW32 ~/Desktop/lab02/alice/project (master)
|
||||||
|
$ git init
|
||||||
|
Reinitialized existing Git repository in C:/Users/u113-13/Desktop/lab02/alice/project/.git/
|
||||||
|
|
||||||
|
u113-13@PROG-23 MINGW32 ~/Desktop/lab02/alice/project (master)
|
||||||
|
$ git branch -m main
|
||||||
|
error: refname refs/heads/master not found
|
||||||
|
fatal: Branch rename failed
|
||||||
|
|
||||||
|
u113-13@PROG-23 MINGW32 ~/Desktop/lab02/alice/project (master)
|
||||||
|
$ git config user.name 'Alice (MovsisyanRG)'
|
||||||
|
|
||||||
|
u113-13@PROG-23 MINGW32 ~/Desktop/lab02/alice/project (master)
|
||||||
|
$ git config user.email 'MovsisianRG@mpei.ru'
|
||||||
|
|
||||||
|
5. Ñîçäàë ïðîåêò â ðåïîçèòàðèè Àëèñû
|
||||||
|
6. ïðîñìîòðåë ñîñòîÿíèå ðàáî÷åé êîïèè
|
||||||
|
$ git status
|
||||||
|
On branch master (èìÿ òåêóùåé âåòâè 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)
|
||||||
|
|
||||||
|
Çàí¸ñ main.cpp ïîä Git
|
||||||
|
|
||||||
|
u113-13@PROG-23 MINGW32 ~/Desktop/lab02/alice/project (master)
|
||||||
|
$ git add main.cpp
|
||||||
|
|
||||||
|
Åùå ðàç ïðîñìîòðåë ñîñòîÿíèå ðàáî÷åé êîïèè
|
||||||
|
|
||||||
|
$ git status
|
||||||
|
On branch master
|
||||||
|
|
||||||
|
No commits yet
|
||||||
|
|
||||||
|
Changes to be committed:
|
||||||
|
(use "git rm --cached <file>..." to unstage)
|
||||||
|
|
||||||
|
new file: main.cpp (äîáàâèëñÿ íîâûé îòñëåæèâàåìûé ôàéë)
|
||||||
|
|
||||||
|
Untracked files:
|
||||||
|
(use "git add <file>..." to include in what will be committed)
|
||||||
|
|
||||||
|
project.cbp
|
||||||
|
|
||||||
|
Âûïîëíèë êîììèò ñ ôàéëîì main.cpp
|
||||||
|
|
||||||
|
u113-13@PROG-23 MINGW32 ~/Desktop/lab02/alice/project (master)
|
||||||
|
$ git commit -m 'code: çàãîòîâêà ïðîãðàììû'
|
||||||
|
[master (root-commit) 5fdca83] code: çàãîòîâêà ïðîãðàììû
|
||||||
|
1 file changed, 9 insertions(+)
|
||||||
|
create mode 100644 main.cpp
|
||||||
|
|
||||||
|
7. Äîáàâèë ôàéë projcet.cbp â èíäåêñ è ñäåëàë êîììèò ñ íèì
|
||||||
|
|
||||||
|
$ 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
|
||||||
|
|
||||||
|
u113-13@PROG-23 MINGW32 ~/Desktop/lab02/alice/project (master)
|
||||||
|
$ git commit -m 'build: add project file'
|
||||||
|
[master 00a65a5] build: add project file
|
||||||
|
1 file changed, 40 insertions(+)
|
||||||
|
create mode 100644 project.cbp
|
||||||
|
|
||||||
|
8. Ïåðåèìåíîâàë èìÿ âåòêè íà main (òàê êàê äî ýòîãî íå ïîëó÷àëîñü)
|
||||||
|
$ git branch -m main
|
||||||
|
|
||||||
|
u113-13@PROG-23 MINGW32 ~/Desktop/lab02/alice/project (main)
|
||||||
|
|
||||||
|
9. Çàìåíèë òåëî ôóíêöèè main() íà ââîä äâóõ ÷èñåë, ïîñìîòðåë ñîñòîÿíèå ðåïîçèòàðèÿ
|
||||||
|
$ git status
|
||||||
|
On branch main
|
||||||
|
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
|
||||||
|
|
||||||
|
Untracked files:
|
||||||
|
(use "git add <file>..." to include in what will be committed)
|
||||||
|
|
||||||
|
bin/
|
||||||
|
obj/
|
||||||
|
|
||||||
|
no changes added to commit (use "git add" and/or "git commit -a")
|
||||||
|
|
||||||
|
u113-13@PROG-23 MINGW32 ~/Desktop/lab02/alice/project (main)
|
||||||
|
|
||||||
|
Êîãäà èçìåíÿåòñÿ ñóùåñòâóþùé, åñòü ïðèïèñêà modified:, à ïðè äîáàâëåíèè íîâûõ, îíè èäóò ïîä îòäåëüíîå óñëîâèå untracked file:
|
||||||
|
|
||||||
|
Äîáàâèë ñóììó è ðàçíîñòü ÷èñåë a è b, à òàê æå ïîïðîáîâàë 3 ñïîñîáà çàêîììèòèòü èçìåíåíèÿ
|
||||||
|
u113-13@PROG-23 MINGW32 ~/Desktop/lab02/alice/project (main)
|
||||||
|
$ git add main.cpp
|
||||||
|
|
||||||
|
u113-13@PROG-23 MINGW32 ~/Desktop/lab02/alice/project (main)
|
||||||
|
$ git commit -m "code: çàãîòîâêà ïðîãðàììû ñ ââîäîì ÷èñåë"
|
||||||
|
[main 79d7c57] code: çàãîòîâêà ïðîãðàììû ñ ââîäîì ÷èñåë
|
||||||
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
u113-13@PROG-23 MINGW32 ~/Desktop/lab02/alice/project (main)
|
||||||
|
$ git add -u
|
||||||
|
|
||||||
|
u113-13@PROG-23 MINGW32 ~/Desktop/lab02/alice/project (main)
|
||||||
|
$ git commit -m "code: äîáàâëåíà ñóììà a è b"
|
||||||
|
[main dfdb00c] code: äîáàâëåíà ñóììà a è b
|
||||||
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
|
u113-13@PROG-23 MINGW32 ~/Desktop/lab02/alice/project (main)
|
||||||
|
$ git commit -a -m "code: äîáàâëåíà ðàçíîñòü a è b"
|
||||||
|
[main 84a34f0] code: äîáàâëåíà ðàçíîñòü a è b
|
||||||
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
|
u113-13@PROG-23 MINGW32 ~/Desktop/lab02/alice/project (main)
|
||||||
|
|
||||||
|
10. Ñîçäàë íîâûé ôàéë .gitignore, äîáàâèë åãî ïîä Git è ñîçäàë êîììèò
|
||||||
|
u113-13@PROG-23 MINGW32 ~/Desktop/lab02/alice/project (main)
|
||||||
|
$ git add .gitignore
|
||||||
|
|
||||||
|
u113-13@PROG-23 MINGW32 ~/Desktop/lab02/alice/project (main)
|
||||||
|
$ git commit -m "git: ñîçäàí ôàéë äëÿ èãíîðà êàòàëîãîâ"
|
||||||
|
[main ea99681] git: ñîçäàí ôàéë äëÿ èãíîðà êàòàëîãîâ
|
||||||
|
1 file changed, 3 insertions(+)
|
||||||
|
create mode 100644 .gitignore
|
||||||
|
|
||||||
|
u113-13@PROG-23 MINGW32 ~/Desktop/lab02/alice/project (main)
|
||||||
|
|
||||||
|
11.Íàøåë ñíà÷àëà êîììèòû ïî òåìå build, çàòåì êîììèòû, çàòðàãèâàþùèå project.cbp.
|
||||||
|
$ git log --grep "build"
|
||||||
|
commit 00a65a558b74d187bf374ea9fb4cd040de92c1c1
|
||||||
|
Author: Alice (MovsisyanRG) <MovsisianRG@mpei.ru>
|
||||||
|
Date: Wed Mar 27 14:28:14 2024 +0300
|
||||||
|
|
||||||
|
build: add project file
|
||||||
|
|
||||||
|
u113-13@PROG-23 MINGW32 ~/Desktop/lab02/alice/project (main)
|
||||||
|
$ git log -- project.cbp
|
||||||
|
commit 00a65a558b74d187bf374ea9fb4cd040de92c1c1
|
||||||
|
Author: Alice (MovsisyanRG) <MovsisianRG@mpei.ru>
|
||||||
|
Date: Wed Mar 27 14:28:14 2024 +0300
|
||||||
|
|
||||||
|
build: add project file
|
||||||
|
|
||||||
|
u113-13@PROG-23 MINGW32 ~/Desktop/lab02/alice/project (main)
|
||||||
|
|
||||||
|
12. Ïðñìîòðåë ïðåäïîñëåäíèé êîììèò
|
||||||
|
$ git show HEAD~1
|
||||||
|
commit 84a34f007082206aa093e8e76408d0c4ed8303df
|
||||||
|
Author: Alice (MovsisyanRG) <MovsisianRG@mpei.ru>
|
||||||
|
Date: Wed Mar 27 14:38:36 2024 +0300
|
||||||
|
|
||||||
|
code: aiaaaeaia ?aciinou a e b
|
||||||
|
|
||||||
|
diff --git a/main.cpp b/main.cpp
|
||||||
|
index 9bfc0db..1c9caca 100644
|
||||||
|
--- a/main.cpp
|
||||||
|
+++ b/main.cpp
|
||||||
|
@@ -8,5 +8,6 @@ int main()
|
||||||
|
int a, b;
|
||||||
|
cin >> a >> b;
|
||||||
|
cout << "A + B = " << a + b << '\n'
|
||||||
|
+ << "A - B = " << a - b << '\n';
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
13. Ïðîñìîòðåë èçìåíåíèÿ ìåæäó ñàìûì ïåðâûì êîììèòîì è êîììèòîì, äîáàâëÿþùèì âûâîä ðàçíîñòè.
|
||||||
|
$ git diff HEAD~2 HEAD
|
||||||
|
diff --git a/.gitignore b/.gitignore
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..d85abef
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/.gitignore
|
||||||
|
@@ -0,0 +1,3 @@
|
||||||
|
+/bin
|
||||||
|
+/obj
|
||||||
|
+/*.layout
|
||||||
|
diff --git a/main.cpp b/main.cpp
|
||||||
|
index 9bfc0db..1c9caca 100644
|
||||||
|
--- a/main.cpp
|
||||||
|
+++ b/main.cpp
|
||||||
|
@@ -8,5 +8,6 @@ int main()
|
||||||
|
int a, b;
|
||||||
|
cin >> a >> b;
|
||||||
|
cout << "A + B = " << a + b << '\n'
|
||||||
|
+ << "A - B = " << a - b << '\n';
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
14. Çàêîììèòèë ïðîèâçåäåíèå, îòêàòèë êîììèò, äîáàâèë êîìåíò â main è îòêàòèë äðóãèì ñïîñîáîì
|
||||||
|
$ git commit -m "code: äîáàâëåíî ïðîèçâåäåíèå a è b"
|
||||||
|
On branch main
|
||||||
|
Changes not staged for commit:
|
||||||
|
modified: main.cpp
|
||||||
|
modified: project.cbp
|
||||||
|
|
||||||
|
no changes added to commit
|
||||||
|
|
||||||
|
u113-13@PROG-23 MINGW32 ~/Desktop/lab02/alice/project (main)
|
||||||
|
$ git reset --hard HEAD~1
|
||||||
|
HEAD is now at 84a34f0 code: äîáàâëåíà ðàçíîñòü a è b
|
||||||
|
|
||||||
|
u113-13@PROG-23 MINGW32 ~/Desktop/lab02/alice/project (main)
|
||||||
|
$ git checkout HEAD -- main.cpp
|
||||||
|
|
||||||
|
u113-13@PROG-23 MINGW32 ~/Desktop/lab02/alice/project (main)
|
||||||
|
|
||||||
|
15. Ñîçäàë ïàðó êëþ÷åé, çàïóñòèë àãåíò, äîáàâèë â ñïèñîê â ñâîåé ó÷ çàïèñè
|
||||||
|
$ ssh-keygen
|
||||||
|
Generating public/private rsa key pair.
|
||||||
|
Enter file in which to save the key (/c/Users/u113-13/.ssh/id_rsa):
|
||||||
|
Created directory '/c/Users/u113-13/.ssh'.
|
||||||
|
Enter passphrase (empty for no passphrase):
|
||||||
|
Enter same passphrase again:
|
||||||
|
Your identification has been saved in /c/Users/u113-13/.ssh/id_rsa.
|
||||||
|
Your public key has been saved in /c/Users/u113-13/.ssh/id_rsa.pub.
|
||||||
|
The key fingerprint is:
|
||||||
|
SHA256:RnKZThnNyOJGC+i68NI+ElEHIsJitMgcBBdX1lB8//g u113-13@PROG-23
|
||||||
|
The key's randomart image is:
|
||||||
|
+---[RSA 2048]----+
|
||||||
|
|X+++..+*o+ |
|
||||||
|
|B==.o.o ==+ |
|
||||||
|
|+* . +.oB. . |
|
||||||
|
|. . +* . |
|
||||||
|
| o . S o |
|
||||||
|
|+ . . . |
|
||||||
|
|.= . |
|
||||||
|
|+ + E |
|
||||||
|
| +.. |
|
||||||
|
+----[SHA256]-----+
|
||||||
|
|
||||||
|
u113-13@PROG-23 MINGW32 ~/Desktop/lab02/alice/project (main)
|
||||||
|
$ eval $(ssh-agent -s)
|
||||||
|
Agent pid 3536
|
||||||
|
|
||||||
|
u113-13@PROG-23 MINGW32 ~/Desktop/lab02/alice/project (main)
|
||||||
|
$ ssh-add
|
||||||
|
Identity added: /c/Users/u113-13/.ssh/id_rsa (u113-13@PROG-23)
|
||||||
|
|
||||||
|
u113-13@PROG-23 MINGW32 ~/Desktop/lab02/alice/project (main)
|
||||||
|
$ cat ~/.ssh/id_ed25519.pub
|
||||||
|
cat: /c/Users/u113-13/.ssh/id_ed25519.pub: No such file or directory
|
||||||
|
|
||||||
|
u113-13@PROG-23 MINGW32 ~/Desktop/lab02/alice/project (main)
|
||||||
|
$ ^C
|
||||||
|
|
||||||
|
u113-13@PROG-23 MINGW32 ~/Desktop/lab02/alice/project (main)
|
||||||
|
$ $ cat ~/.ssh/id_ed25519.pub
|
||||||
|
bash: $: command not found
|
||||||
|
|
||||||
|
u113-13@PROG-23 MINGW32 ~/Desktop/lab02/alice/project (main)
|
||||||
|
$ $ cat ~/.ssh/id_rsa.pub
|
||||||
|
bash: $: command not found
|
||||||
|
|
||||||
|
u113-13@PROG-23 MINGW32 ~/Desktop/lab02/alice/project (main)
|
||||||
|
$ cat ~/.ssh/id_rsa.pub
|
||||||
|
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDPUxukN6TSyALFkTjGcx+mKcNcMYVCb7kxQ4JvxalE/htjBRwn093fhN5S9jYPmbovF7X7N4oOxfl2Z1eIUtfUq26b6nENPQG8RlA6Z6J6b8bUjlZHzsTYfGTm+AU6K44MtrqWNLCq9hrHd9Ut3Q6tdIB8JHwNlSLwes0YqhwaF4z4sQoX9lHU3P1ZhwvXWrImVoWPT7n4jQJWJ+6+K4cUH6klkVPWyZqKMJkMnzSM+eVWQyiMCnxIIDq/FR/2A5UsmOO6anAYt0oo51PQrUyqsJ4hQf9wsic2FuuAr4suTjLj2F6Pb7XyoS03Y5TLlhXYJ5hdEJoiBriXbeOtR5RL u113-13@PROG-23
|
||||||
|
|
||||||
|
16. Ñîçäàë ðåïîçèòàðèé è èìïîðòèðîâàë äàííûå èç gitbash
|
||||||
|
$ git remote add origin git@uit.mpei.ru:MovsisianRG/cs-lab02.git
|
||||||
|
|
||||||
|
u113-13@PROG-23 MINGW32 ~/Desktop/lab02/alice/project (main)
|
||||||
|
$ git push -u origin main
|
||||||
|
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: 15, done.
|
||||||
|
Counting objects: 100% (15/15), done.
|
||||||
|
Compressing objects: 100% (14/14), done.
|
||||||
|
Writing objects: 100% (15/15), 1.92 KiB | 246.00 KiB/s, done.
|
||||||
|
Total 15 (delta 3), reused 0 (delta 0)
|
||||||
|
remote: . Processing 1 references
|
||||||
|
remote: Processed 1 references in total
|
||||||
|
To uit.mpei.ru:MovsisianRG/cs-lab02.git
|
||||||
|
* [new branch] main -> main
|
||||||
|
Branch 'main' set up to track remote branch 'main' from 'origin'.
|
||||||
|
|
||||||
|
17. Êëîíèðîâàë ïðîåêò è íàñòðîèë Git
|
||||||
|
$ git clone git@uit.mpei.ru:MovsisianRG/cs-lab02.git project
|
||||||
|
Cloning into 'project'...
|
||||||
|
remote: Enumerating objects: 15, done.
|
||||||
|
remote: Counting objects: 100% (15/15), done.
|
||||||
|
remote: Compressing objects: 100% (14/14), done.
|
||||||
|
remote: Total 15 (delta 3), reused 0 (delta 0), pack-reused 0
|
||||||
|
Receiving objects: 100% (15/15), 1.92 KiB | 246.00 KiB/s, done.
|
||||||
|
Resolving deltas: 100% (3/3), done.
|
||||||
|
|
||||||
|
u113-13@PROG-23 MINGW32 ~/Desktop/lab02/bob
|
||||||
|
$ cd project
|
||||||
|
u113-13@PROG-23 MINGW32 ~/Desktop/lab02/bob/project (main)
|
||||||
|
|
||||||
|
$ git config user.name 'Alice (MovsisyanRG)'
|
||||||
|
|
||||||
|
u113-13@PROG-23 MINGW32 ~/Desktop/lab02/bob/project (main)
|
||||||
|
$ git config user.email 'MovsisianRG@mpei.ru'
|
||||||
|
|
||||||
|
18. «Íà ìàøèíå Áîáà» äîáàâèë â ïðîãðàììó ïå÷àòü ïðîèçâåäåíèÿ ÷èñåë è ñäåëàë êîììèò, ïðîâåðèë çàãðóçêó èçìåíåíèé, èñòîðèþ âñåõ âåòîê, ïðîäâèíóë âåòêó main ê ñêà÷àííîé âåðñèè, «Îò èìåíè Àëèñû» äîáàâèë â ïðîãðàììó ïå÷àòü äåëåíèÿ, ñäåëàéòå êîììèò, îòïðàâüòå åãî íà ñåðâåð è ïîëó÷èë íîâóþ âåðñèþ «íà ìàøèíå Áîáà».
|
||||||
|
u113-13@PROG-25 MINGW32 /l/I eo?n/A-3-23/Rafael Movsisyan/lab02/lab02/bob/project (main)
|
||||||
|
$ git commit -a -m "code: oiii?aiea a e b"
|
||||||
|
[main 434d199] code: oiii?aiea a e b
|
||||||
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||||
|
u113-13@PROG-25 MINGW32 /l/I eo?n/A-3-23/Rafael Movsisyan/lab02/lab02/bob/project (main)
|
||||||
|
$ git push
|
||||||
|
Enumerating objects: 5, done.
|
||||||
|
Counting objects: 100% (5/5), done.
|
||||||
|
Compressing objects: 100% (3/3), done.
|
||||||
|
Writing objects: 100% (3/3), 377 bytes | 62.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:MovsisianRG/cs-lab02.git
|
||||||
|
84a34f0..434d199 main -> main
|
||||||
|
u113-13@PROG-25 MINGW32 /l/I êóðñ/À-3-23/Rafael Movsisyan/lab02/lab02/alice/project (main)
|
||||||
|
$ 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:MovsisianRG/cs-lab02
|
||||||
|
84a34f0..434d199 main -> origin/main
|
||||||
|
|
||||||
|
u113-13@PROG-25 MINGW32 /l/I êóðñ/À-3-23/Rafael Movsisyan/lab02/lab02/alice/project (main)
|
||||||
|
$ git log --oneline --decorate --all --graph
|
||||||
|
* 434d199 (origin/main) code: óìíîæåíèå a è b
|
||||||
|
| * 9254bb9 (double) code: ñìåíèë èíò íà äàáë
|
||||||
|
| * 16d3cd7 code: äîáàâèë ìèíèìóì
|
||||||
|
|/
|
||||||
|
* 84a34f0 (HEAD -> main) code: äîáàâëåíà ðàçíîñòü a è b
|
||||||
|
* dfdb00c code: äîáàâëåíà ñóììà a è b
|
||||||
|
* 79d7c57 code: çàãîòîâêà ïðîãðàììû ñ ââîäîì ÷èñåë
|
||||||
|
* 00a65a5 build: add project file
|
||||||
|
* 5fdca83 code: çàãîòîâêà ïðîãðàììû
|
||||||
|
|
||||||
|
u113-13@PROG-25 MINGW32 /l/I êóðñ/À-3-23/Rafael Movsisyan/lab02/lab02/alice/project (main)
|
||||||
|
$ git pull --ff-only
|
||||||
|
|
||||||
|
Updating 84a34f0..434d199
|
||||||
|
Fast-forward
|
||||||
|
main.cpp | 3 ++-
|
||||||
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||||
|
u113-13@PROG-25 MINGW32 /l/I êóðñ/À-3-23/Rafael Movsisyan/lab02/lab02/alice/project (main)
|
||||||
|
$ git commit -a -m "code: äåëåíèå a è b"
|
||||||
|
[main 8168f86] code: äåëåíèå a è b
|
||||||
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
u113-13@PROG-25 MINGW32 /l/I êóðñ/À-3-23/Rafael Movsisyan/lab02/lab02/alice/project (main)
|
||||||
|
$ git push
|
||||||
|
Enumerating objects: 5, done.
|
||||||
|
Counting objects: 100% (5/5), done.
|
||||||
|
Compressing objects: 100% (3/3), done.
|
||||||
|
Writing objects: 100% (3/3), 364 bytes | 91.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:MovsisianRG/cs-lab02.git
|
||||||
|
434d199..8168f86 main -> main
|
||||||
|
u113-13@PROG-25 MINGW32 /l/I eo?n/A-3-23/Rafael Movsisyan/lab02/lab02/bob/project (main)
|
||||||
|
$ 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:MovsisianRG/cs-lab02
|
||||||
|
434d199..8168f86 main -> origin/main
|
||||||
|
|
||||||
|
u113-13@PROG-25 MINGW32 /l/I eo?n/A-3-23/Rafael Movsisyan/lab02/lab02/bob/project (main)
|
||||||
|
$ git log --oneline --decorate --all --graph
|
||||||
|
* 8168f86 (origin/main, origin/HEAD) code: aaeaiea a e b
|
||||||
|
* 434d199 (HEAD -> main) code: oiii?aiea a e b
|
||||||
|
* 84a34f0 code: aiaaaeaia ?aciinou a e b
|
||||||
|
* dfdb00c code: aiaaaeaia noiia a e b
|
||||||
|
* 79d7c57 code: caaioiaea i?ia?aiiu n aaiaii ?enae
|
||||||
|
* 00a65a5 build: add project file
|
||||||
|
* 5fdca83 code: caaioiaea i?ia?aiiu
|
||||||
|
|
||||||
|
u113-13@PROG-25 MINGW32 /l/I eo?n/A-3-23/Rafael Movsisyan/lab02/lab02/bob/project (main)
|
||||||
|
$
|
||||||
|
|
||||||
|
u113-13@PROG-25 MINGW32 /l/I eo?n/A-3-23/Rafael Movsisyan/lab02/lab02/bob/project (main)
|
||||||
|
$ git pull --ff-only
|
||||||
|
|
||||||
|
Updating 434d199..8168f86
|
||||||
|
Fast-forward
|
||||||
|
main.cpp | 3 ++-
|
||||||
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||||
|
19. Ñäåëàë ìàêñèìóì ó Àëèñû, ìèíèìóì ó Áîáà è îòïðàâèë êîììèòû íà ñåðâåð
|
||||||
|
u113-13@PROG-25 MINGW32 /l/I êóðñ/À-3-23/Rafael Movsisyan/lab02/lab02/alice/project (main)
|
||||||
|
$ git commit -a -m "code: max a,b"
|
||||||
|
[main b59bab6] code: max a,b
|
||||||
|
1 file changed, 9 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
u113-13@PROG-25 MINGW32 /l/I êóðñ/À-3-23/Rafael Movsisyan/lab02/lab02/alice/project (main)
|
||||||
|
$ git push
|
||||||
|
Enumerating objects: 5, done.
|
||||||
|
Counting objects: 100% (5/5), done.
|
||||||
|
Compressing objects: 100% (3/3), done.
|
||||||
|
Writing objects: 100% (3/3), 424 bytes | 106.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:MovsisianRG/cs-lab02.git
|
||||||
|
8168f86..b59bab6 main -> main
|
||||||
|
u113-13@PROG-25 MINGW32 /l/I êóðñ/À-3-23/Rafael Movsisyan/lab02/lab02/bob/project (main)
|
||||||
|
$ git commit -a -m "code: Min a,b"
|
||||||
|
[main 8dab624] code: Min a,b
|
||||||
|
1 file changed, 10 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
u113-13@PROG-25 MINGW32 /l/I êóðñ/À-3-23/Rafael Movsisyan/lab02/lab02/bob/project (main)
|
||||||
|
$ git push
|
||||||
|
To uit.mpei.ru:MovsisianRG/cs-lab02.git
|
||||||
|
! [rejected] main -> main (fetch first)
|
||||||
|
error: failed to push some refs to 'git@uit.mpei.ru:MovsisianRG/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.
|
||||||
|
$ 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:MovsisianRG/cs-lab02
|
||||||
|
8168f86..b59bab6 main -> origin/main
|
||||||
|
|
||||||
|
u113-13@PROG-25 MINGW32 /l/I eo?n/A-3-23/Rafael Movsisyan/lab02/lab02/bob/project (main)
|
||||||
|
$ git log --oneline --decorate --all --graph
|
||||||
|
* 8dab624 (HEAD -> main) code: Min a,b
|
||||||
|
| * b59bab6 (origin/main, origin/HEAD) code: max a,b
|
||||||
|
|/
|
||||||
|
* 8168f86 code: aaeaiea a e b
|
||||||
|
* 434d199 code: oiii?aiea a e b
|
||||||
|
* 84a34f0 code: aiaaaeaia ?aciinou a e b
|
||||||
|
* dfdb00c code: aiaaaeaia noiia a e b
|
||||||
|
* 79d7c57 code: caaioiaea i?ia?aiiu n aaiaii ?enae
|
||||||
|
* 00a65a5 build: add project file
|
||||||
|
* 5fdca83 code: caaioiaea i?ia?aiiu
|
||||||
|
u113-13@PROG-25 MINGW32 /l/I eo?n/A-3-23/Rafael Movsisyan/lab02/lab02/bob/project (main|REBASE 1/1)
|
||||||
|
$ git add main.cpp
|
||||||
|
|
||||||
|
u113-13@PROG-25 MINGW32 /l/I eo?n/A-3-23/Rafael Movsisyan/lab02/lab02/bob/project (main|REBASE 1/1)
|
||||||
|
$ git rebase --continue
|
||||||
|
Applying: code: Min a,b
|
||||||
|
|
||||||
|
u113-13@PROG-25 MINGW32 /l/I eo?n/A-3-23/Rafael Movsisyan/lab02/lab02/bob/project (main)
|
||||||
|
$ git fetch
|
||||||
|
|
||||||
|
u113-13@PROG-25 MINGW32 /l/I eo?n/A-3-23/Rafael Movsisyan/lab02/lab02/bob/project (main)
|
||||||
|
$ git log --oneline --decorate --all --graph
|
||||||
|
* 8f5697c (HEAD -> main) code: Min a,b
|
||||||
|
* b59bab6 (origin/main, origin/HEAD) code: max a,b
|
||||||
|
* 8168f86 code: aaeaiea a e b
|
||||||
|
* 434d199 code: oiii?aiea a e b
|
||||||
|
* 84a34f0 code: aiaaaeaia ?aciinou a e b
|
||||||
|
* dfdb00c code: aiaaaeaia noiia a e b
|
||||||
|
* 79d7c57 code: caaioiaea i?ia?aiiu n aaiaii ?enae
|
||||||
|
* 00a65a5 build: add project file
|
||||||
|
* 5fdca83 code: caaioiaea i?ia?aiiu
|
||||||
|
|
||||||
|
u113-13@PROG-25 MINGW32 /l/I eo?n/A-3-23/Rafael Movsisyan/lab02/lab02/bob/project (main)
|
||||||
|
$
|
||||||
|
20. Äîáàâèë âåòêó double, èçìåíèë òèï ïåðåìåííûõ à è b íà double, ñèíõðîíèçèðîâàë âåòêó main íà Àëèñå ñ ñåðâåðîì è ñëèë âåòêó double â main
|
||||||
|
$ 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:MovsisianRG/cs-lab02
|
||||||
|
b59bab6..8f5697c main -> origin/main
|
||||||
|
|
||||||
|
u113-13@PROG-25 MINGW32 /l/I eo?n/A-3-23/Rafael Movsisyan/lab02/lab02/alice/project (main)
|
||||||
|
$ git log --oneline --decorate --all --graph
|
||||||
|
* 7ec4e0d (double) code: double a,b
|
||||||
|
* 9254bb9 code: niaiee eio ia aaae
|
||||||
|
* 16d3cd7 code: aiaaaee ieieioi
|
||||||
|
| * 8f5697c (origin/main) code: Min a,b
|
||||||
|
| * b59bab6 (HEAD -> main) code: max a,b
|
||||||
|
| * 8168f86 code: aaeaiea a e b
|
||||||
|
| * 434d199 code: oiii?aiea a e b
|
||||||
|
|/
|
||||||
|
* 84a34f0 code: aiaaaeaia ?aciinou a e b
|
||||||
|
* dfdb00c code: aiaaaeaia noiia a e b
|
||||||
|
* 79d7c57 code: caaioiaea i?ia?aiiu n aaiaii ?enae
|
||||||
|
* 00a65a5 build: add project file
|
||||||
|
* 5fdca83 code: caaioiaea i?ia?aiiu
|
||||||
|
|
||||||
|
u113-13@PROG-25 MINGW32 /l/I eo?n/A-3-23/Rafael Movsisyan/lab02/lab02/alice/project (main)
|
||||||
|
$ git pull --ff-only
|
||||||
|
Updating b59bab6..8f5697c
|
||||||
|
Fast-forward
|
||||||
|
main.cpp | 7 +++++--
|
||||||
|
1 file changed, 5 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
u113-13@PROG-25 MINGW32 /l/I eo?n/A-3-23/Rafael Movsisyan/lab02/lab02/alice/project (main)
|
||||||
|
$ git fetch
|
||||||
|
|
||||||
|
u113-13@PROG-25 MINGW32 /l/I eo?n/A-3-23/Rafael Movsisyan/lab02/lab02/alice/project (main)
|
||||||
|
$ git log --oneline --decorate --all --graph
|
||||||
|
* 7ec4e0d (double) code: double a,b
|
||||||
|
* 9254bb9 code: niaiee eio ia aaae
|
||||||
|
* 16d3cd7 code: aiaaaee ieieioi
|
||||||
|
| * 8f5697c (HEAD -> main, origin/main) code: Min a,b
|
||||||
|
| * b59bab6 code: max a,b
|
||||||
|
| * 8168f86 code: aaeaiea a e b
|
||||||
|
| * 434d199 code: oiii?aiea a e b
|
||||||
|
|/
|
||||||
|
* 84a34f0 code: aiaaaeaia ?aciinou a e b
|
||||||
|
* dfdb00c code: aiaaaeaia noiia a e b
|
||||||
|
* 79d7c57 code: caaioiaea i?ia?aiiu n aaiaii ?enae
|
||||||
|
* 00a65a5 build: add project file
|
||||||
|
* 5fdca83 code: caaioiaea i?ia?aiiu
|
||||||
|
u113-13@PROG-25 MINGW32 /l/I eo?n/A-3-23/Rafael Movsisyan/lab02/lab02/alice/project (main|MERGING)
|
||||||
|
$ git add main.cpp
|
||||||
|
|
||||||
|
u113-13@PROG-25 MINGW32 /l/I eo?n/A-3-23/Rafael Movsisyan/lab02/lab02/alice/project (main|MERGING)
|
||||||
|
$ git merge --continue
|
||||||
|
[main 63c7f6a] Merge branch 'double' into main neee aaoeo double a main
|
||||||
|
|
||||||
|
u113-13@PROG-25 MINGW32 /l/I eo?n/A-3-23/Rafael Movsisyan/lab02/lab02/alice/project (main)
|
||||||
|
$ git push
|
||||||
|
Enumerating objects: 17, done.
|
||||||
|
Counting objects: 100% (17/17), done.
|
||||||
|
Compressing objects: 100% (13/13), done.
|
||||||
|
Writing objects: 100% (13/13), 1.59 KiB | 56.00 KiB/s, done.
|
||||||
|
Total 13 (delta 4), reused 0 (delta 0)
|
||||||
|
remote: . Processing 1 references
|
||||||
|
remote: Processed 1 references in total
|
||||||
|
To uit.mpei.ru:MovsisianRG/cs-lab02.git
|
||||||
|
8f5697c..63c7f6a main -> main
|
||||||
|
|
||||||
|
u113-13@PROG-25 MINGW32 /l/I eo?n/A-3-23/Rafael Movsisyan/lab02/lab02/alice/project (main)
|
||||||
|
$
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Загрузка…
Ссылка в новой задаче