sdf
dsf
unknown
plain_text
3 years ago
40 kB
2
Indexable
Never
Last login: Tue Feb 15 15:45:54 on ttys000 rob@MacBook-Air-rob ~ % cd Desktop rob@MacBook-Air-rob Desktop % cd studia/semestr\ 1/skw rob@MacBook-Air-rob skw % git clone http://212.182.24.105/robert.krzywina/kontrola.git fatal: destination path 'kontrola' already exists and is not an empty directory. rob@MacBook-Air-rob skw % cd .. rob@MacBook-Air-rob semestr 1 % git clone http://212.182.24.105/robert.krzywina/kontrola.git Cloning into 'kontrola'... remote: Enumerating objects: 362, done. remote: Counting objects: 100% (6/6), done. remote: Compressing objects: 100% (6/6), done. remote: Total 362 (delta 1), reused 0 (delta 0), pack-reused 356 Receiving objects: 100% (362/362), 3.02 MiB | 5.07 MiB/s, done. Resolving deltas: 100% (165/165), done. rob@MacBook-Air-rob semestr 1 % cd kontrola rob@MacBook-Air-rob kontrola % ls Main.java rob@MacBook-Air-rob kontrola % git status On branch main Your branch is up to date with 'origin/main'. Changes not staged for commit: (use "git add/rm <file>..." to update what will be committed) (use "git restore <file>..." to discard changes in working directory) deleted: Main.java no changes added to commit (use "git add" and/or "git commit -a") rob@MacBook-Air-rob kontrola % git add . rob@MacBook-Air-rob kontrola % git status On branch main Your branch is up to date with 'origin/main'. Changes to be committed: (use "git restore --staged <file>..." to unstage) deleted: Main.java rob@MacBook-Air-rob kontrola % git commit -m "Cleanup repo" [main 2549099] Cleanup repo 1 file changed, 63 deletions(-) delete mode 100644 Main.java rob@MacBook-Air-rob kontrola % git push origin main Enumerating objects: 3, done. Counting objects: 100% (3/3), done. Delta compression using up to 8 threads Compressing objects: 100% (1/1), done. Writing objects: 100% (2/2), 243 bytes | 243.00 KiB/s, done. Total 2 (delta 0), reused 1 (delta 0), pack-reused 0 To http://212.182.24.105/robert.krzywina/kontrola.git dfa2df7..2549099 main -> main rob@MacBook-Air-rob kontrola % git tag | xargs git tag -d Deleted tag 'v.0.5.9' (was 6e2d49f) Deleted tag 'v0.01' (was 58cc34b) Deleted tag 'v0.02' (was 269f34f) Deleted tag 'v0.03' (was 654ad96) Deleted tag 'v0.5.8' (was 6f69829) Deleted tag 'v1.0' (was f29dc72) Deleted tag 'v2.0' (was 68e951d) Deleted tag 'v3.0' (was 4b875c4) Deleted tag 'v4.0' (was 2a43890) rob@MacBook-Air-rob kontrola % git push -f origin main Everything up-to-date rob@MacBook-Air-rob kontrola % git tag -l | xargs -n 1 git push --delete origin rob@MacBook-Air-rob kontrola % git push origin main Everything up-to-date rob@MacBook-Air-rob kontrola % git push tag fatal: 'tag' does not appear to be a git repository fatal: Could not read from remote repository. Please make sure you have the correct access rights and the repository exists. rob@MacBook-Air-rob kontrola % git push --tags Everything up-to-date rob@MacBook-Air-rob kontrola % git tag rob@MacBook-Air-rob kontrola % git tag -n rob@MacBook-Air-rob kontrola % git push origin :refs/tags/v.0.5.9 To http://212.182.24.105/robert.krzywina/kontrola.git - [deleted] v.0.5.9 rob@MacBook-Air-rob kontrola % git push origin :refs/tags/v0.01 To http://212.182.24.105/robert.krzywina/kontrola.git - [deleted] v0.01 rob@MacBook-Air-rob kontrola % git push origin :refs/tags/v0.02 To http://212.182.24.105/robert.krzywina/kontrola.git - [deleted] v0.02 rob@MacBook-Air-rob kontrola % git push origin :refs/tags/v0.03 To http://212.182.24.105/robert.krzywina/kontrola.git - [deleted] v0.03 rob@MacBook-Air-rob kontrola % git push origin :refs/tags/v0.5.8 To http://212.182.24.105/robert.krzywina/kontrola.git - [deleted] v0.5.8 rob@MacBook-Air-rob kontrola % git push origin :refs/tags/v1.0 To http://212.182.24.105/robert.krzywina/kontrola.git - [deleted] v1.0 rob@MacBook-Air-rob kontrola % git push origin :refs/tags/v2.0 To http://212.182.24.105/robert.krzywina/kontrola.git - [deleted] v2.0 rob@MacBook-Air-rob kontrola % git push origin :refs/tags/v3.0 To http://212.182.24.105/robert.krzywina/kontrola.git - [deleted] v3.0 rob@MacBook-Air-rob kontrola % git push origin :refs/tags/v4.0 To http://212.182.24.105/robert.krzywina/kontrola.git - [deleted] v4.0 rob@MacBook-Air-rob kontrola % clear rob@MacBook-Air-rob kontrola % git branch -a * main remotes/origin/HEAD -> origin/main remotes/origin/main rob@MacBook-Air-rob kontrola % git checkout -b "develop" Switched to a new branch 'develop' rob@MacBook-Air-rob kontrola % git push origin develop Total 0 (delta 0), reused 0 (delta 0), pack-reused 0 remote: remote: To create a merge request for develop, visit: remote: http://212.182.24.105/robert.krzywina/kontrola/-/merge_requests/new?merge_request%5Bsource_branch%5D=develop remote: To http://212.182.24.105/robert.krzywina/kontrola.git * [new branch] develop -> develop rob@MacBook-Air-rob kontrola % git branch * develop main rob@MacBook-Air-rob kontrola % git checkout -b "srednia" Switched to a new branch 'srednia' rob@MacBook-Air-rob kontrola % touch Main.java rob@MacBook-Air-rob kontrola % git status On branch srednia Untracked files: (use "git add <file>..." to include in what will be committed) Main.java nothing added to commit but untracked files present (use "git add" to track) rob@MacBook-Air-rob kontrola % git add . rob@MacBook-Air-rob kontrola % git status On branch srednia Changes to be committed: (use "git restore --staged <file>..." to unstage) new file: Main.java rob@MacBook-Air-rob kontrola % git commit -m "srednia" [srednia 75c17a0] srednia 1 file changed, 15 insertions(+) create mode 100644 Main.java rob@MacBook-Air-rob kontrola % git push origin srednia Enumerating objects: 4, done. Counting objects: 100% (4/4), done. Delta compression using up to 8 threads Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 472 bytes | 472.00 KiB/s, done. Total 3 (delta 0), reused 0 (delta 0), pack-reused 0 remote: remote: To create a merge request for srednia, visit: remote: http://212.182.24.105/robert.krzywina/kontrola/-/merge_requests/new?merge_request%5Bsource_branch%5D=srednia remote: To http://212.182.24.105/robert.krzywina/kontrola.git * [new branch] srednia -> srednia rob@MacBook-Air-rob kontrola % git checkout develop Switched to branch 'develop' rob@MacBook-Air-rob kontrola % git merge --no-ff srednia Merge made by the 'recursive' strategy. Main.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 Main.java rob@MacBook-Air-rob kontrola % git push origin develop Enumerating objects: 1, done. Counting objects: 100% (1/1), done. Writing objects: 100% (1/1), 241 bytes | 241.00 KiB/s, done. Total 1 (delta 0), reused 0 (delta 0), pack-reused 0 remote: remote: To create a merge request for develop, visit: remote: http://212.182.24.105/robert.krzywina/kontrola/-/merge_requests/new?merge_request%5Bsource_branch%5D=develop remote: To http://212.182.24.105/robert.krzywina/kontrola.git 2549099..2af7281 develop -> develop rob@MacBook-Air-rob kontrola % git branch * develop main srednia rob@MacBook-Air-rob kontrola % git checkout -b "najwieksza_najnizsza" Switched to a new branch 'najwieksza_najnizsza' rob@MacBook-Air-rob kontrola % git status On branch najwieksza_najnizsza nothing to commit, working tree clean rob@MacBook-Air-rob kontrola % git status On branch najwieksza_najnizsza 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.java no changes added to commit (use "git add" and/or "git commit -a") rob@MacBook-Air-rob kontrola % git branch develop main * najwieksza_najnizsza srednia rob@MacBook-Air-rob kontrola % git add . rob@MacBook-Air-rob kontrola % git branch develop main * najwieksza_najnizsza srednia rob@MacBook-Air-rob kontrola % git status On branch najwieksza_najnizsza Changes to be committed: (use "git restore --staged <file>..." to unstage) modified: Main.java rob@MacBook-Air-rob kontrola % git commit -m "najwieksza i najmniejsza" [najwieksza_najnizsza c703fff] najwieksza i najmniejsza 1 file changed, 20 insertions(+) rob@MacBook-Air-rob kontrola % git push origin "najwieksza_najnizsza" Enumerating objects: 5, done. Counting objects: 100% (5/5), done. Delta compression using up to 8 threads Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 663 bytes | 663.00 KiB/s, done. Total 3 (delta 0), reused 0 (delta 0), pack-reused 0 remote: remote: To create a merge request for najwieksza_najnizsza, visit: remote: http://212.182.24.105/robert.krzywina/kontrola/-/merge_requests/new?merge_request%5Bsource_branch%5D=najwieksza_najnizsza remote: To http://212.182.24.105/robert.krzywina/kontrola.git * [new branch] najwieksza_najnizsza -> najwieksza_najnizsza rob@MacBook-Air-rob kontrola % git checkout develop Switched to branch 'develop' rob@MacBook-Air-rob kontrola % git status On branch develop nothing to commit, working tree clean rob@MacBook-Air-rob kontrola % git merge --no-ff "najwieksza_najnizsza" Merge made by the 'recursive' strategy. Main.java | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) rob@MacBook-Air-rob kontrola % git push origin develop Enumerating objects: 1, done. Counting objects: 100% (1/1), done. Writing objects: 100% (1/1), 249 bytes | 249.00 KiB/s, done. Total 1 (delta 0), reused 0 (delta 0), pack-reused 0 remote: remote: To create a merge request for develop, visit: remote: http://212.182.24.105/robert.krzywina/kontrola/-/merge_requests/new?merge_request%5Bsource_branch%5D=develop remote: To http://212.182.24.105/robert.krzywina/kontrola.git 2af7281..5e8dfbb develop -> develop rob@MacBook-Air-rob kontrola % git checkout -b release Switched to a new branch 'release' rob@MacBook-Air-rob kontrola % git push origin release Total 0 (delta 0), reused 0 (delta 0), pack-reused 0 remote: remote: To create a merge request for release, visit: remote: http://212.182.24.105/robert.krzywina/kontrola/-/merge_requests/new?merge_request%5Bsource_branch%5D=release remote: To http://212.182.24.105/robert.krzywina/kontrola.git * [new branch] release -> release rob@MacBook-Air-rob kontrola % git tag kol2_v2.1 rob@MacBook-Air-rob kontrola % git push origin kol2_v2.1 Total 0 (delta 0), reused 0 (delta 0), pack-reused 0 To http://212.182.24.105/robert.krzywina/kontrola.git * [new tag] kol2_v2.1 -> kol2_v2.1 rob@MacBook-Air-rob kontrola % git checkout main Switched to branch 'main' Your branch is up to date with 'origin/main'. rob@MacBook-Air-rob kontrola % git merge --no-ff develop Merge made by the 'recursive' strategy. Main.java | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 Main.java rob@MacBook-Air-rob kontrola % git push origin main Enumerating objects: 1, done. Counting objects: 100% (1/1), done. Writing objects: 100% (1/1), 230 bytes | 230.00 KiB/s, done. Total 1 (delta 0), reused 0 (delta 0), pack-reused 0 To http://212.182.24.105/robert.krzywina/kontrola.git 2549099..006d063 main -> main rob@MacBook-Air-rob kontrola % git checkout develop Switched to branch 'develop' rob@MacBook-Air-rob kontrola % git checkout -b "mediana" Switched to a new branch 'mediana' rob@MacBook-Air-rob kontrola % git status On branch mediana 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.java no changes added to commit (use "git add" and/or "git commit -a") rob@MacBook-Air-rob kontrola % git add . rob@MacBook-Air-rob kontrola % git status On branch mediana Changes to be committed: (use "git restore --staged <file>..." to unstage) modified: Main.java rob@MacBook-Air-rob kontrola % git commit -m "Mediana" [mediana 2eaf05c] Mediana 1 file changed, 9 insertions(+) rob@MacBook-Air-rob kontrola % git branch develop main * mediana najwieksza_najnizsza release srednia rob@MacBook-Air-rob kontrola % git push origin mediana Enumerating objects: 5, done. Counting objects: 100% (5/5), done. Delta compression using up to 8 threads Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 449 bytes | 449.00 KiB/s, done. Total 3 (delta 1), reused 0 (delta 0), pack-reused 0 remote: remote: To create a merge request for mediana, visit: remote: http://212.182.24.105/robert.krzywina/kontrola/-/merge_requests/new?merge_request%5Bsource_branch%5D=mediana remote: To http://212.182.24.105/robert.krzywina/kontrola.git * [new branch] mediana -> mediana rob@MacBook-Air-rob kontrola % git checkout -b "hotfix_mediana" Switched to a new branch 'hotfix_mediana' rob@MacBook-Air-rob kontrola % git status On branch hotfix_mediana 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.java Untracked files: (use "git add <file>..." to include in what will be committed) .idea/ no changes added to commit (use "git add" and/or "git commit -a") rob@MacBook-Air-rob kontrola % git add Main.java rob@MacBook-Air-rob kontrola % git status On branch hotfix_mediana Changes to be committed: (use "git restore --staged <file>..." to unstage) modified: Main.java Untracked files: (use "git add <file>..." to include in what will be committed) .idea/ rob@MacBook-Air-rob kontrola % git commit -m "hotfix mediany" [hotfix_mediana 918eb40] hotfix mediany 1 file changed, 5 insertions(+) rob@MacBook-Air-rob kontrola % git branch develop * hotfix_mediana main mediana najwieksza_najnizsza release srednia rob@MacBook-Air-rob kontrola % git push origin hotfix_mediana Enumerating objects: 5, done. Counting objects: 100% (5/5), done. Delta compression using up to 8 threads Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 411 bytes | 411.00 KiB/s, done. Total 3 (delta 1), reused 0 (delta 0), pack-reused 0 remote: remote: To create a merge request for hotfix_mediana, visit: remote: http://212.182.24.105/robert.krzywina/kontrola/-/merge_requests/new?merge_request%5Bsource_branch%5D=hotfix_mediana remote: To http://212.182.24.105/robert.krzywina/kontrola.git * [new branch] hotfix_mediana -> hotfix_mediana rob@MacBook-Air-rob kontrola % git checkout develop Switched to branch 'develop' rob@MacBook-Air-rob kontrola % git merge --no-ff hotfix_mediana Merge made by the 'recursive' strategy. Main.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) rob@MacBook-Air-rob kontrola % git push origin develop Enumerating objects: 1, done. Counting objects: 100% (1/1), done. Writing objects: 100% (1/1), 247 bytes | 247.00 KiB/s, done. Total 1 (delta 0), reused 0 (delta 0), pack-reused 0 remote: remote: To create a merge request for develop, visit: remote: http://212.182.24.105/robert.krzywina/kontrola/-/merge_requests/new?merge_request%5Bsource_branch%5D=develop remote: To http://212.182.24.105/robert.krzywina/kontrola.git 5e8dfbb..41f4cb2 develop -> develop rob@MacBook-Air-rob kontrola % git tag kol2_v2.2 rob@MacBook-Air-rob kontrola % git push kol2_v2.2 fatal: 'kol2_v2.2' does not appear to be a git repository fatal: Could not read from remote repository. Please make sure you have the correct access rights and the repository exists. rob@MacBook-Air-rob kontrola % git push origin kol2_v2.2 Total 0 (delta 0), reused 0 (delta 0), pack-reused 0 To http://212.182.24.105/robert.krzywina/kontrola.git * [new tag] kol2_v2.2 -> kol2_v2.2 rob@MacBook-Air-rob kontrola % git checkout main Switched to branch 'main' Your branch is up to date with 'origin/main'. rob@MacBook-Air-rob kontrola % git merge --no-ff develop Merge made by the 'recursive' strategy. Main.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) rob@MacBook-Air-rob kontrola % git push origin main Enumerating objects: 1, done. Counting objects: 100% (1/1), done. Writing objects: 100% (1/1), 232 bytes | 232.00 KiB/s, done. Total 1 (delta 0), reused 0 (delta 0), pack-reused 0 To http://212.182.24.105/robert.krzywina/kontrola.git 006d063..d7ed08f main -> main rob@MacBook-Air-rob kontrola % git status On branch main Your branch is up to date with 'origin/main'. Untracked files: (use "git add <file>..." to include in what will be committed) .idea/ nothing added to commit but untracked files present (use "git add" to track) rob@MacBook-Air-rob kontrola % git checkout develop Switched to branch 'develop' rob@MacBook-Air-rob kontrola % git checkout -b "statystyki" Switched to a new branch 'statystyki' rob@MacBook-Air-rob kontrola % git status On branch statystyki 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.java Untracked files: (use "git add <file>..." to include in what will be committed) .idea/ no changes added to commit (use "git add" and/or "git commit -a") rob@MacBook-Air-rob kontrola % git add Main.java rob@MacBook-Air-rob kontrola % git status On branch statystyki Changes to be committed: (use "git restore --staged <file>..." to unstage) modified: Main.java Untracked files: (use "git add <file>..." to include in what will be committed) .idea/ rob@MacBook-Air-rob kontrola % git commit -m "statystyki" [statystyki 1e79e7c] statystyki 1 file changed, 19 insertions(+), 7 deletions(-) rob@MacBook-Air-rob kontrola % git branch develop hotfix_mediana main mediana najwieksza_najnizsza release srednia * statystyki rob@MacBook-Air-rob kontrola % git push origin statystyki Enumerating objects: 5, done. Counting objects: 100% (5/5), done. Delta compression using up to 8 threads Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 615 bytes | 615.00 KiB/s, done. Total 3 (delta 1), reused 0 (delta 0), pack-reused 0 remote: remote: To create a merge request for statystyki, visit: remote: http://212.182.24.105/robert.krzywina/kontrola/-/merge_requests/new?merge_request%5Bsource_branch%5D=statystyki remote: To http://212.182.24.105/robert.krzywina/kontrola.git * [new branch] statystyki -> statystyki rob@MacBook-Air-rob kontrola % git branch develop hotfix_mediana main mediana najwieksza_najnizsza release srednia * statystyki rob@MacBook-Air-rob kontrola % git checkout develop Switched to branch 'develop' rob@MacBook-Air-rob kontrola % git merge --no-ff srednia Already up to date. rob@MacBook-Air-rob kontrola % git merge --no-ff statystyki Merge made by the 'recursive' strategy. Main.java | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) rob@MacBook-Air-rob kontrola % git push origin develop Enumerating objects: 1, done. Counting objects: 100% (1/1), done. Writing objects: 100% (1/1), 242 bytes | 242.00 KiB/s, done. Total 1 (delta 0), reused 0 (delta 0), pack-reused 0 remote: remote: To create a merge request for develop, visit: remote: http://212.182.24.105/robert.krzywina/kontrola/-/merge_requests/new?merge_request%5Bsource_branch%5D=develop remote: To http://212.182.24.105/robert.krzywina/kontrola.git 41f4cb2..803687e develop -> develop rob@MacBook-Air-rob kontrola % git checkout main Switched to branch 'main' Your branch is up to date with 'origin/main'. rob@MacBook-Air-rob kontrola % git checkout releeease error: pathspec 'releeease' did not match any file(s) known to git rob@MacBook-Air-rob kontrola % git checkout relese error: pathspec 'relese' did not match any file(s) known to git rob@MacBook-Air-rob kontrola % git checkout release Switched to branch 'release' rob@MacBook-Air-rob kontrola % git tag kol2_v2.3 rob@MacBook-Air-rob kontrola % git push origin kol2_v2.3 Total 0 (delta 0), reused 0 (delta 0), pack-reused 0 To http://212.182.24.105/robert.krzywina/kontrola.git * [new tag] kol2_v2.3 -> kol2_v2.3 rob@MacBook-Air-rob kontrola % git checkout main Switched to branch 'main' Your branch is up to date with 'origin/main'. rob@MacBook-Air-rob kontrola % git merge --no-ff release Already up to date. rob@MacBook-Air-rob kontrola % git checkout release Switched to branch 'release' rob@MacBook-Air-rob kontrola % git merge --no-ff develop Merge made by the 'recursive' strategy. Main.java | 36 +++++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) rob@MacBook-Air-rob kontrola % git push origin release Enumerating objects: 1, done. Counting objects: 100% (1/1), done. Writing objects: 100% (1/1), 238 bytes | 238.00 KiB/s, done. Total 1 (delta 0), reused 0 (delta 0), pack-reused 0 remote: remote: To create a merge request for release, visit: remote: http://212.182.24.105/robert.krzywina/kontrola/-/merge_requests/new?merge_request%5Bsource_branch%5D=release remote: To http://212.182.24.105/robert.krzywina/kontrola.git 5e8dfbb..0742870 release -> release rob@MacBook-Air-rob kontrola % git checkout main Switched to branch 'main' Your branch is up to date with 'origin/main'. rob@MacBook-Air-rob kontrola % git merge --no-ff release Merge made by the 'recursive' strategy. Main.java | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) rob@MacBook-Air-rob kontrola % git push origin main Enumerating objects: 1, done. Counting objects: 100% (1/1), done. Writing objects: 100% (1/1), 230 bytes | 230.00 KiB/s, done. Total 1 (delta 0), reused 0 (delta 0), pack-reused 0 To http://212.182.24.105/robert.krzywina/kontrola.git d7ed08f..f0a47db main -> main rob@MacBook-Air-rob kontrola % git branch develop hotfix_mediana * main mediana najwieksza_najnizsza release srednia statystyki rob@MacBook-Air-rob kontrola % git push origin kol2_v2.3 Everything up-to-date rob@MacBook-Air-rob kontrola % git checkout -b "hotfix-zaokroglenie" Switched to a new branch 'hotfix-zaokroglenie' rob@MacBook-Air-rob kontrola % git status On branch hotfix-zaokroglenie 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.java Untracked files: (use "git add <file>..." to include in what will be committed) .idea/ no changes added to commit (use "git add" and/or "git commit -a") rob@MacBook-Air-rob kontrola % git add Main.java rob@MacBook-Air-rob kontrola % git status On branch hotfix-zaokroglenie Changes to be committed: (use "git restore --staged <file>..." to unstage) modified: Main.java Untracked files: (use "git add <file>..." to include in what will be committed) .idea/ rob@MacBook-Air-rob kontrola % git commit -m "Fix na zaokroglenie" [hotfix-zaokroglenie 59d0351] Fix na zaokroglenie 1 file changed, 2 insertions(+), 2 deletions(-) rob@MacBook-Air-rob kontrola % git branch develop * hotfix-zaokroglenie hotfix_mediana main mediana najwieksza_najnizsza release srednia statystyki rob@MacBook-Air-rob kontrola % git push origin hotfix-zaokroglenie Enumerating objects: 5, done. Counting objects: 100% (5/5), done. Delta compression using up to 8 threads Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 357 bytes | 357.00 KiB/s, done. Total 3 (delta 1), reused 0 (delta 0), pack-reused 0 remote: remote: To create a merge request for hotfix-zaokroglenie, visit: remote: http://212.182.24.105/robert.krzywina/kontrola/-/merge_requests/new?merge_request%5Bsource_branch%5D=hotfix-zaokroglenie remote: To http://212.182.24.105/robert.krzywina/kontrola.git * [new branch] hotfix-zaokroglenie -> hotfix-zaokroglenie rob@MacBook-Air-rob kontrola % git checkout main Switched to branch 'main' Your branch is up to date with 'origin/main'. rob@MacBook-Air-rob kontrola % git merge --no-ff hotfix-zaokraglenie merge: hotfix-zaokraglenie - not something we can merge rob@MacBook-Air-rob kontrola % git merge --no-ff hotfix-zaokrooglenie merge: hotfix-zaokrooglenie - not something we can merge rob@MacBook-Air-rob kontrola % git merge --no-ff "hotfix-zaokroglenie" Merge made by the 'recursive' strategy. Main.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rob@MacBook-Air-rob kontrola % git push origin main Enumerating objects: 1, done. Counting objects: 100% (1/1), done. Writing objects: 100% (1/1), 241 bytes | 241.00 KiB/s, done. Total 1 (delta 0), reused 0 (delta 0), pack-reused 0 To http://212.182.24.105/robert.krzywina/kontrola.git f0a47db..d169712 main -> main rob@MacBook-Air-rob kontrola % git status On branch main Your branch is up to date with 'origin/main'. Untracked files: (use "git add <file>..." to include in what will be committed) .idea/ nothing added to commit but untracked files present (use "git add" to track) rob@MacBook-Air-rob kontrola % git branch develop hotfix-zaokroglenie hotfix_mediana * main mediana najwieksza_najnizsza release srednia statystyki rob@MacBook-Air-rob kontrola % git reset --hard HEAD is now at d169712 Merge branch 'hotfix-zaokroglenie' rob@MacBook-Air-rob kontrola % clear rob@MacBook-Air-rob kontrola % git reset --hard HEAD is now at d169712 Merge branch 'hotfix-zaokroglenie' rob@MacBook-Air-rob kontrola % git status On branch main Your branch is up to date with 'origin/main'. Untracked files: (use "git add <file>..." to include in what will be committed) .idea/ nothing added to commit but untracked files present (use "git add" to track) rob@MacBook-Air-rob kontrola % clear rob@MacBook-Air-rob kontrola % git merge develop Already up to date. rob@MacBook-Air-rob kontrola % git checkout develop Switched to branch 'develop' rob@MacBook-Air-rob kontrola % git checkout -b "pole_kola" Switched to a new branch 'pole_kola' rob@MacBook-Air-rob kontrola % git status On branch pole_kola 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.java Untracked files: (use "git add <file>..." to include in what will be committed) .idea/ no changes added to commit (use "git add" and/or "git commit -a") rob@MacBook-Air-rob kontrola % git add Main.java rob@MacBook-Air-rob kontrola % git status On branch pole_kola Changes to be committed: (use "git restore --staged <file>..." to unstage) modified: Main.java Untracked files: (use "git add <file>..." to include in what will be committed) .idea/ rob@MacBook-Air-rob kontrola % git branch develop hotfix-zaokroglenie hotfix_mediana main mediana najwieksza_najnizsza * pole_kola release srednia statystyki rob@MacBook-Air-rob kontrola % git commit -m "oblicz pole kola" [pole_kola 7ba3b53] oblicz pole kola 1 file changed, 7 insertions(+), 1 deletion(-) rob@MacBook-Air-rob kontrola % git push origin pole_kola Enumerating objects: 5, done. Counting objects: 100% (5/5), done. Delta compression using up to 8 threads Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 456 bytes | 456.00 KiB/s, done. Total 3 (delta 1), reused 0 (delta 0), pack-reused 0 remote: remote: To create a merge request for pole_kola, visit: remote: http://212.182.24.105/robert.krzywina/kontrola/-/merge_requests/new?merge_request%5Bsource_branch%5D=pole_kola remote: To http://212.182.24.105/robert.krzywina/kontrola.git * [new branch] pole_kola -> pole_kola rob@MacBook-Air-rob kontrola % git checkout develop Switched to branch 'develop' rob@MacBook-Air-rob kontrola % git merge --no-ff pole_kola Merge made by the 'recursive' strategy. Main.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) rob@MacBook-Air-rob kontrola % git push origin develop Enumerating objects: 1, done. Counting objects: 100% (1/1), done. Writing objects: 100% (1/1), 242 bytes | 242.00 KiB/s, done. Total 1 (delta 0), reused 0 (delta 0), pack-reused 0 remote: remote: To create a merge request for develop, visit: remote: http://212.182.24.105/robert.krzywina/kontrola/-/merge_requests/new?merge_request%5Bsource_branch%5D=develop remote: To http://212.182.24.105/robert.krzywina/kontrola.git 803687e..197af55 develop -> develop rob@MacBook-Air-rob kontrola % git checkout -b "pole_kwadratu" Switched to a new branch 'pole_kwadratu' rob@MacBook-Air-rob kontrola % git status On branch pole_kwadratu 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.java Untracked files: (use "git add <file>..." to include in what will be committed) .idea/ no changes added to commit (use "git add" and/or "git commit -a") rob@MacBook-Air-rob kontrola % git add Main.java rob@MacBook-Air-rob kontrola % git status On branch pole_kwadratu Changes to be committed: (use "git restore --staged <file>..." to unstage) modified: Main.java Untracked files: (use "git add <file>..." to include in what will be committed) .idea/ rob@MacBook-Air-rob kontrola % git commit -m "oblicz pole kwadratu" [pole_kwadratu 3cdc2c7] oblicz pole kwadratu 1 file changed, 5 insertions(+) rob@MacBook-Air-rob kontrola % git push origin pole_kwadratu Enumerating objects: 5, done. Counting objects: 100% (5/5), done. Delta compression using up to 8 threads Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 405 bytes | 405.00 KiB/s, done. Total 3 (delta 1), reused 0 (delta 0), pack-reused 0 remote: remote: To create a merge request for pole_kwadratu, visit: remote: http://212.182.24.105/robert.krzywina/kontrola/-/merge_requests/new?merge_request%5Bsource_branch%5D=pole_kwadratu remote: To http://212.182.24.105/robert.krzywina/kontrola.git * [new branch] pole_kwadratu -> pole_kwadratu rob@MacBook-Air-rob kontrola % git checkout develop Switched to branch 'develop' rob@MacBook-Air-rob kontrola % git merge --no-ff pole_kwadratu Merge made by the 'recursive' strategy. Main.java | 5 +++++ 1 file changed, 5 insertions(+) rob@MacBook-Air-rob kontrola % git push origin develop Enumerating objects: 1, done. Counting objects: 100% (1/1), done. Writing objects: 100% (1/1), 247 bytes | 247.00 KiB/s, done. Total 1 (delta 0), reused 0 (delta 0), pack-reused 0 remote: remote: To create a merge request for develop, visit: remote: http://212.182.24.105/robert.krzywina/kontrola/-/merge_requests/new?merge_request%5Bsource_branch%5D=develop remote: To http://212.182.24.105/robert.krzywina/kontrola.git 197af55..c1078b5 develop -> develop rob@MacBook-Air-rob kontrola % git tag kol2_v2.2.0 rob@MacBook-Air-rob kontrola % git push origin kol2_v2.2.0 Total 0 (delta 0), reused 0 (delta 0), pack-reused 0 To http://212.182.24.105/robert.krzywina/kontrola.git * [new tag] kol2_v2.2.0 -> kol2_v2.2.0 rob@MacBook-Air-rob kontrola % git checkout main Switched to branch 'main' Your branch is up to date with 'origin/main'. rob@MacBook-Air-rob kontrola % git merge --no-ff develop Auto-merging Main.java Merge made by the 'recursive' strategy. Main.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) rob@MacBook-Air-rob kontrola % git push origin main Enumerating objects: 7, done. Counting objects: 100% (7/7), done. Delta compression using up to 8 threads Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 389 bytes | 389.00 KiB/s, done. Total 3 (delta 1), reused 0 (delta 0), pack-reused 0 To http://212.182.24.105/robert.krzywina/kontrola.git d169712..f3865f3 main -> main rob@MacBook-Air-rob kontrola % git checkout develop Switched to branch 'develop' rob@MacBook-Air-rob kontrola % git checkout -b "pole_kolo_wewnatrz_kwadratu" Switched to a new branch 'pole_kolo_wewnatrz_kwadratu' rob@MacBook-Air-rob kontrola % git status On branch pole_kolo_wewnatrz_kwadratu 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.java Untracked files: (use "git add <file>..." to include in what will be committed) .idea/ no changes added to commit (use "git add" and/or "git commit -a") rob@MacBook-Air-rob kontrola % git add Main.java rob@MacBook-Air-rob kontrola % git commit -m "Dodaj czy pole kola miesci sie wewnatrz kwadratu" [pole_kolo_wewnatrz_kwadratu 2bdbf3b] Dodaj czy pole kola miesci sie wewnatrz kwadratu 1 file changed, 5 insertions(+) rob@MacBook-Air-rob kontrola % git push origin pole_kolo_wewnatrz_kwadratu Enumerating objects: 5, done. Counting objects: 100% (5/5), done. Delta compression using up to 8 threads Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 440 bytes | 440.00 KiB/s, done. Total 3 (delta 1), reused 0 (delta 0), pack-reused 0 remote: remote: To create a merge request for pole_kolo_wewnatrz_kwadratu, visit: remote: http://212.182.24.105/robert.krzywina/kontrola/-/merge_requests/new?merge_request%5Bsource_branch%5D=pole_kolo_wewnatrz_kwadratu remote: To http://212.182.24.105/robert.krzywina/kontrola.git * [new branch] pole_kolo_wewnatrz_kwadratu -> pole_kolo_wewnatrz_kwadratu rob@MacBook-Air-rob kontrola % git checkout develop Switched to branch 'develop' rob@MacBook-Air-rob kontrola % git merge --no-ff pole_kolo_wewnatrz_kwadratu Merge made by the 'recursive' strategy. Main.java | 5 +++++ 1 file changed, 5 insertions(+) rob@MacBook-Air-rob kontrola % git push origin develop Enumerating objects: 1, done. Counting objects: 100% (1/1), done. Writing objects: 100% (1/1), 256 bytes | 256.00 KiB/s, done. Total 1 (delta 0), reused 0 (delta 0), pack-reused 0 remote: remote: To create a merge request for develop, visit: remote: http://212.182.24.105/robert.krzywina/kontrola/-/merge_requests/new?merge_request%5Bsource_branch%5D=develop remote: To http://212.182.24.105/robert.krzywina/kontrola.git c1078b5..8d2c1e7 develop -> develop rob@MacBook-Air-rob kontrola % git checkout main Switched to branch 'main' Your branch is up to date with 'origin/main'. rob@MacBook-Air-rob kontrola % git merge --no-ff develop Auto-merging Main.java Merge made by the 'recursive' strategy. Main.java | 5 +++++ 1 file changed, 5 insertions(+) rob@MacBook-Air-rob kontrola % git push origin main Enumerating objects: 7, done. Counting objects: 100% (7/7), done. Delta compression using up to 8 threads Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 386 bytes | 386.00 KiB/s, done. Total 3 (delta 1), reused 0 (delta 0), pack-reused 0 To http://212.182.24.105/robert.krzywina/kontrola.git f3865f3..4b37d18 main -> main rob@MacBook-Air-rob kontrola % clear rob@MacBook-Air-rob kontrola % cd Desktop cd: no such file or directory: Desktop rob@MacBook-Air-rob kontrola % cd ! cd: no such file or directory: ! rob@MacBook-Air-rob kontrola % cd ~ rob@MacBook-Air-rob ~ % cd Desktop/studia/kolos/mercurial rob@MacBook-Air-rob mercurial % clear rob@MacBook-Air-rob mercurial % hg init rob@MacBook-Air-rob mercurial % ls rob@MacBook-Air-rob mercurial % ls -a . .. .hg rob@MacBook-Air-rob mercurial % clear rob@MacBook-Air-rob mercurial % cd .. rob@MacBook-Air-rob kolos % mkdir project rob@MacBook-Air-rob kolos % cd project rob@MacBook-Air-rob project % hg bookmarks abort: no repository found in '/Users/rob/Desktop/studia/kolos/project' (.hg not found) rob@MacBook-Air-rob project % hg init rob@MacBook-Air-rob project % hg bookmarks no bookmarks set rob@MacBook-Air-rob project % hg bookmark project rob@MacBook-Air-rob project % hg bookmarks * project -1:000000000000 rob@MacBook-Air-rob project % touch kol2Projekt.txt rob@MacBook-Air-rob project % hg add adding kol2Projekt.txt rob@MacBook-Air-rob project % hg commit -m "kol2Projekt" rob@MacBook-Air-rob project % hg bookmark API rob@MacBook-Air-rob project % touch API.txt rob@MacBook-Air-rob project % hg add adding API.txt rob@MacBook-Air-rob project % hg commit -m "API" rob@MacBook-Air-rob project % hg bookmark * API 1:fcd8436b7ea6 project 0:21c2cbfcab69 rob@MacBook-Air-rob project % hg checkout project 0 files updated, 0 files merged, 1 files removed, 0 files unresolved (activating bookmark project) rob@MacBook-Air-rob project % hg bookmark API 1:fcd8436b7ea6 * project 0:21c2cbfcab69 rob@MacBook-Air-rob project % hg bookmark CMS rob@MacBook-Air-rob project % touch CMS.txt rob@MacBook-Air-rob project % hg add adding CMS.txt rob@MacBook-Air-rob project % hg commit -m "CMS" created new head rob@MacBook-Air-rob project % hg checkout project 0 files updated, 0 files merged, 1 files removed, 0 files unresolved (activating bookmark project) rob@MacBook-Air-rob project % hg bookmark "Baza danych" rob@MacBook-Air-rob project % touch Baza danych.txt rob@MacBook-Air-rob project % touch Baza_danych.txt rob@MacBook-Air-rob project % hg add adding Baza_danych.txt rob@MacBook-Air-rob project % hg commit -m "Baza danych" created new head rob@MacBook-Air-rob project % hg bookmarks API 1:fcd8436b7ea6 * Baza danych 3:0ce778aedcae CMS 2:e7a6e324bc9e project 0:21c2cbfcab69 rob@MacBook-Air-rob project % hg bookmark frontend rob@MacBook-Air-rob project % hg merge CMS 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) rob@MacBook-Air-rob project % hg commit -m "dodane CMSy" rob@MacBook-Air-rob project % hg bookmark project moving bookmark 'project' forward from 21c2cbfcab69 rob@MacBook-Air-rob project % hg bookmark kontrolery rob@MacBook-Air-rob project % touch kontrolery.txt rob@MacBook-Air-rob project % hg add adding kontrolery.txt rob@MacBook-Air-rob project % hg commit -m "kontrolery" rob@MacBook-Air-rob project % hg bookmark project moving bookmark 'project' forward from 39d2fa416fb7 rob@MacBook-Air-rob project % hg bookmark widoki rob@MacBook-Air-rob project % touch widoki.txt rob@MacBook-Air-rob project % hg add adding widoki.txt rob@MacBook-Air-rob project % hg commit -m "widoki" rob@MacBook-Air-rob project % hg bookmark project moving bookmark 'project' forward from 56e9d6976b45 rob@MacBook-Air-rob project % hg bookmark backend rob@MacBook-Air-rob project % touch backend.txt rob@MacBook-Air-rob project % hg add adding backend.txt rob@MacBook-Air-rob project % hg commit -m "backend" rob@MacBook-Air-rob project % hg bookmark modele rob@MacBook-Air-rob project % touch modele.txt rob@MacBook-Air-rob project % hg commit -m "modele" nothing changed rob@MacBook-Air-rob project % hg add adding modele.txt rob@MacBook-Air-rob project % hg commit -m "modele" rob@MacBook-Air-rob project % hg bookmark widoki moving bookmark 'widoki' forward from 037278f9e57a rob@MacBook-Air-rob project % hg merge backend" dquote> rob@MacBook-Air-rob project % hg merge backend abort: merging with a working directory ancestor has no effect rob@MacBook-Air-rob project % hg bookmark API 1:fcd8436b7ea6 Baza danych 3:0ce778aedcae CMS 2:e7a6e324bc9e backend 7:7161506f7aad frontend 4:39d2fa416fb7 kontrolery 5:56e9d6976b45 modele 8:2fe7525397c2 project 6:037278f9e57a * widoki 8:2fe7525397c2 rob@MacBook-Air-rob project % hg merge backend abort: merging with a working directory ancestor has no effect rob@MacBook-Air-rob project %