diff --git a/README.md b/README.md index 9b0b7fd..1511759 100644 --- a/README.md +++ b/README.md @@ -15,94 +15,94 @@ C:\Users\Acer\cs-lab02\Alice>mkdir project C:\Users\Acer\cs-lab02\Alice>cd project -C:\Users\Acer\cs-lab02\Alice\project>git init -Initialized empty Git repository in C:/Users/Acer/cs-lab02/Alice/project/.git/ +C:\Users\Acer\cs-lab02\Alice\project>git config user.name 'Alice (SekirinAA)' +C:\Users\Acer\cs-lab02\Alice\project>git config user.email 'yesartem7@gmail.com' +C:\Users\Acer\cs-lab02\Alice\project>git status +C:\Users\Acer\cs-lab02\Alice\project>..." to include in what will be committed) + (use "..." to include in what will be committed) main.cpp project.cbp -nothing added to commit but untracked files present (use "git add" to track) +nothing added to commit but untracked files present (use "git add main.cpp +C:\Users\Acer\cs-lab02\Alice\project>git commit -m "code: заготовка программы" +C:\Users\Acer\cs-lab02\Alice\project>git status **### Изменение статуса файла main.cpp, теперь в staging area только project.cbp** +C:\Users\Acer\cs-lab02\Alice\project>..." to include in what will be committed) + (use "..." to include in what will be committed) project.cbp -nothing added to commit but untracked files present (use "git add" to track) +nothing added to commit but untracked files present (use "git add project.cbp +C:\Users\Acer\cs-lab02\Alice\project>git status +C:\Users\Acer\cs-lab02\Alice\project>..." to unstage) + (use "..." to unstage) new file: project.cbp -C:\Users\Acer\cs-lab02\Alice\project>git commit -m "build: update CMake version" +C:\Users\Acer\cs-lab02\Alice\project>git status **### Теперь все файлы попали в комит** +C:\Users\Acer\cs-lab02\Alice\project>git status +C:\Users\Acer\cs-lab02\Alice\project>..." to update what will be committed) - (use "git restore ..." to discard changes in working directory) + (use "..." to update what will be committed) + (use "..." to discard changes in working directory) modified: main.cpp -no changes added to commit (use "git add" and/or "git commit -a") +no changes added to commit (use "git add main.cpp +C:\Users\Acer\cs-lab02\Alice\project>git commit -m "Input commit" +C:\Users\Acer\cs-lab02\Alice\project>git add main.cpp +C:\Users\Acer\cs-lab02\Alice\project>git commit -m "Sum commit" +C:\Users\Acer\cs-lab02\Alice\project>git add main.cpp +C:\Users\Acer\cs-lab02\Alice\project>git status +C:\Users\Acer\cs-lab02\Alice\project>..." to unstage) + (use "..." to unstage) modified: main.cpp -C:\Users\Acer\cs-lab02\Alice\project>git commit -m "Substract commit" +C:\Users\Acer\cs-lab02\Alice\project>git log --stat **### Последние несколь комитов были основаны на доработке main. Снизу показано эти изменения с количеством внесенных доработок** +C:\Users\Acer\cs-lab02\Alice\project> master) Author: Alice @@ -134,21 +134,21 @@ Date: Sun Mar 19 14:42:12 2023 +0300 commit 9fa39a877a5752838e54b8686121b026bef3efa2 Author: Alice -C:\Users\Acer\cs-lab02\Alice\project>git log --oneline --decorate +C:\Users\Acer\cs-lab02\Alice\project> master) Substract commit 2693db2 Sum commit 6496448 Input commit 9fa39a8 build: update CMake version 65e82c5 code: заготовка программы -C:\Users\Acer\cs-lab02\Alice\project>git log --oneline --decorate --all --graph +C:\Users\Acer\cs-lab02\Alice\project> master) Substract commit * 2693db2 Sum commit * 6496448 Input commit * 9fa39a8 build: update CMake version * 65e82c5 code: заготовка программы -C:\Users\Acer\cs-lab02\Alice\project>git log -- main.cpp +C:\Users\Acer\cs-lab02\Alice\project> master) Author: Alice Date: Sun Mar 19 14:43:59 2023 +0300 @@ -173,35 +173,35 @@ Date: Sun Mar 19 14:39:56 2023 +0300 code: заготовка программы -C:\Users\Acer\cs-lab02\Alice\project>git log -- project.cbp +C:\Users\Acer\cs-lab02\Alice\project> Date: Sun Mar 19 14:40:41 2023 +0300 build: update CMake version -C:\Users\Acer\cs-lab02\Alice\project>git log --grep "code:" +C:\Users\Acer\cs-lab02\Alice\project> Date: Sun Mar 19 14:39:56 2023 +0300 code: заготовка программы -C:\Users\Acer\cs-lab02\Alice\project>git log --grep "build:" +C:\Users\Acer\cs-lab02\Alice\project> Date: Sun Mar 19 14:40:41 2023 +0300 build: update CMake version -C:\Users\Acer\cs-lab02\Alice\project>git show HEAD +C:\Users\Acer\cs-lab02\Alice\project> master) Author: Alice Date: Sun Mar 19 14:43:59 2023 +0300 Substract commit -diff --git a/main.cpp b/main.cpp +diff --..." to update what will be committed) - (use "git restore ..." to discard changes in working directory) + (use "..." to update what will be committed) + (use "..." to discard changes in working directory) modified: main.cpp -no changes added to commit (use "git add" and/or "git commit -a") +no changes added to commit (use "git add main.cpp +C:\Users\Acer\cs-lab02\Alice\project>git commit -m "Mult commit" +C:\Users\Acer\cs-lab02\Alice\project>git reset --hard ce5ac273 +C:\Users\Acer\cs-lab02\Alice\project>git add main.cpp +C:\Users\Acer\cs-lab02\Alice\project>git commit -m "Comment" +C:\Users\Acer\cs-lab02\Alice\project>git checkout ce5ac273 -- main.cpp +C:\Users\Acer\cs-lab02\Alice\project>git status +C:\Users\Acer\cs-lab02\Alice\project>..." to unstage) + (use "..." to unstage) modified: main.cpp -C:\Users\Acer\cs-lab02\Alice\project>git diff +C:\Users\Acer\cs-lab02\Alice\project>git add . +C:\Users\Acer\cs-lab02\Alice\project>git commit -m "Substract commit' +C:\Users\Acer\cs-lab02\Alice\project>git remote add origin http://uit.mpei.ru/git/SekirinAA/cs-lab02.git +C:\Users\Acer\cs-lab02\Alice\project>git push -u origin main +C:\Users\Acer\cs-lab02\Alice\project>git push -u origin master +C:\Users\Acer\cs-lab02\Alice\project> master branch 'master' set up to track 'origin/master'. @@ -461,7 +461,7 @@ C:\Users\Acer\cs-lab02\Alice>cd .. C:\Users\Acer\cs-lab02>cd Bob -C:\Users\Acer\cs-lab02\Bob>git clone http://uit.mpei.ru/git/SekirinAA/cs-lab02.git project +C:\Users\Acer\cs-lab02\Bob>cd project -C:\Users\Acer\cs-lab02\Bob\project>git config user.name 'Bob (SekirinAA)' +C:\Users\Acer\cs-lab02\Bob\project>git config user.email 'yesartem7@gmail.com' +C:\Users\Acer\cs-lab02\Bob\project>git status +C:\Users\Acer\cs-lab02\Bob\project>..." to update what will be committed) - (use "git restore ..." to discard changes in working directory) + (use "..." to update what will be committed) + (use "..." to discard changes in working directory) modified: main.cpp -no changes added to commit (use "git add" and/or "git commit -a") +no changes added to commit (use "git add main.cpp +C:\Users\Acer\cs-lab02\Bob\project>git commit -m "Mult commit by Bob" +C:\Users\Acer\cs-lab02\Bob\project>git push +C:\Users\Acer\cs-lab02\Bob\project> master C:\Users\Acer\cs-lab02\Bob\project>cd .. @@ -513,16 +513,16 @@ C:\Users\Acer\cs-lab02>cd Alice C:\Users\Acer\cs-lab02\Alice>cd project -C:\Users\Acer\cs-lab02\Alice\project>git fetch +C:\Users\Acer\cs-lab02\Alice\project> origin/master -C:\Users\Acer\cs-lab02\Alice\project>git log --oneline --decorate --all --graph +C:\Users\Acer\cs-lab02\Alice\project> master) Substract commit' * 3a839b5 Comment @@ -532,19 +532,19 @@ C:\Users\Acer\cs-lab02\Alice\project>git log --oneline --decorate --all --graph * 9fa39a8 build: update CMake version * 65e82c5 code: заготовка программы -C:\Users\Acer\cs-lab02\Alice\project>git pull --ff-only +C:\Users\Acer\cs-lab02\Alice\project>git add main.cpp +C:\Users\Acer\cs-lab02\Alice\project>git commit -m "Dividing by Alice" +C:\Users\Acer\cs-lab02\Alice\project>git push +C:\Users\Acer\cs-lab02\Alice\project> master C:\Users\Acer\cs-lab02\Alice\project>cd .. @@ -564,16 +564,16 @@ C:\Users\Acer\cs-lab02>cd Bob C:\Users\Acer\cs-lab02\Bob>cd project -C:\Users\Acer\cs-lab02\Bob\project>git fetch +C:\Users\Acer\cs-lab02\Bob\project> origin/master -C:\Users\Acer\cs-lab02\Bob\project>git log --oneline --decorate --all --graph +C:\Users\Acer\cs-lab02\Bob\project> master) Mult commit by Bob * 33678e1 Substract commit' @@ -584,7 +584,7 @@ C:\Users\Acer\cs-lab02\Bob\project>git log --oneline --decorate --all --graph * 9fa39a8 build: update CMake version * 65e82c5 code: заготовка программы -C:\Users\Acer\cs-lab02\Bob\project>git pull --ff-only +C:\Users\Acer\cs-lab02\Bob\project>cd Alice C:\Users\Acer\cs-lab02\Alice>cd project -C:\Users\Acer\cs-lab02\Alice\project>git add main.cpp +C:\Users\Acer\cs-lab02\Alice\project>git commit -m "Max by Alice" +C:\Users\Acer\cs-lab02\Alice\project>git push +C:\Users\Acer\cs-lab02\Alice\project> master C:\Users\Acer\cs-lab02\Alice\project>cd .. @@ -624,35 +624,35 @@ C:\Users\Acer\cs-lab02>cd Bob C:\Users\Acer\cs-lab02\Bob>cd project -C:\Users\Acer\cs-lab02\Bob\project>git add main.cpp +C:\Users\Acer\cs-lab02\Bob\project>git commit -m "Min by Bob" +C:\Users\Acer\cs-lab02\Bob\project>git push -To http://uit.mpei.ru/git/SekirinAA/cs-lab02.git +C:\Users\Acer\cs-lab02\Bob\project> master (fetch first) -error: failed to push some refs to 'http://uit.mpei.ru/git/SekirinAA/cs-lab02.git' +error: failed to push some refs to 'http://uit.mpei.ru/git fetch +C:\Users\Acer\cs-lab02\Bob\project> origin/master -C:\Users\Acer\cs-lab02\Bob\project>git pull --ff-only +C:\Users\Acer\cs-lab02\Bob\project>git log --oneline --decorate --all --graph +C:\Users\Acer\cs-lab02\Bob\project> master) Min by Bob | * da310d9 (origin/master, origin/HEAD) Max by Alice |/ @@ -666,30 +666,30 @@ C:\Users\Acer\cs-lab02\Bob\project>git log --oneline --decorate --all --graph * 9fa39a8 build: update CMake version * 65e82c5 code: заготовка программы -C:\Users\Acer\cs-lab02\Bob\project>git pull --ff-only +C:\Users\Acer\cs-lab02\Bob\project>git rebase origin/master +C:\Users\Acer\cs-lab02\Bob\project>", then run "git rebase --continue". -hint: You can instead skip this commit: run "git rebase --skip". -hint: To abort and get back to the state before "git rebase", run "git rebase --abort". +hint: "", then run " -C:\Users\Acer\cs-lab02\Bob\project>git add main.cpp +C:\Users\Acer\cs-lab02\Bob\project>git commit -m "Mergingtwo versions" +C:\Users\Acer\cs-lab02\Bob\project>git rebase --continue +C:\Users\Acer\cs-lab02\Bob\project>git log --oneline --decorate --all --graph +C:\Users\Acer\cs-lab02\Bob\project> master) Mergingtwo versions * da310d9 (origin/master, origin/HEAD) Max by Alice * 0f6b392 Dividing by Alice @@ -710,18 +710,18 @@ C:\Users\Acer\cs-lab02>cd Alice C:\Users\Acer\cs-lab02\Alice>cd project -C:\Users\Acer\cs-lab02\Alice\project>git branch double +C:\Users\Acer\cs-lab02\Alice\project>git checkout double +C:\Users\Acer\cs-lab02\Alice\project>git add main.cpp +C:\Users\Acer\cs-lab02\Alice\project>git commit -m "Changing type of variables" +C:\Users\Acer\cs-lab02\Alice\project>git checkout master +C:\Users\Acer\cs-lab02\Alice\project>cd Bob C:\Users\Acer\cs-lab02\Bob>cd project -C:\Users\Acer\cs-lab02\Bob\project>git push +C:\Users\Acer\cs-lab02\Bob\project> master C:\Users\Acer\cs-lab02\Bob\project>cd .. @@ -753,32 +753,32 @@ C:\Users\Acer\cs-lab02>cd Alice C:\Users\Acer\cs-lab02\Alice>cd project -C:\Users\Acer\cs-lab02\Alice\project>git brancg -git: 'brancg' is not a git command. See 'git --help'. +C:\Users\Acer\cs-lab02\Alice\project>git branch +C:\Users\Acer\cs-lab02\Alice\project>git fetch +C:\Users\Acer\cs-lab02\Alice\project> origin/master -C:\Users\Acer\cs-lab02\Alice\project>git pull --ff-only +C:\Users\Acer\cs-lab02\Alice\project>git log --oneline --decorate --all --graph +C:\Users\Acer\cs-lab02\Alice\project> master, origin/master) Mergingtwo versions |/ @@ -793,13 +793,13 @@ C:\Users\Acer\cs-lab02\Alice\project>git log --oneline --decorate --all --graph * 9fa39a8 build: update CMake version * 65e82c5 code: заготовка программы -C:\Users\Acer\cs-lab02\Alice\project>git merge double +C:\Users\Acer\cs-lab02\Alice\project>git push +C:\Users\Acer\cs-lab02\Alice\project> master -C:\Users\Acer\cs-lab02\Alice\project>git log --oneline --decorate --all --graph +C:\Users\Acer\cs-lab02\Alice\project> master, origin/master) Merge branch 'double' |\ | * 412d79f (double) Changing type of variables