s99719/DemoApplication
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added consolelog

Browse Source
This commit is contained in:
s99719
2025-10-14 14:08:34 +02:00
parent 754ffe1c48
commit 44150297fb
1 changed files with 413 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

413
saved.txt Normal file
View File

@@ -0,0 +1,413 @@
Last login: Tue Oct 14 13:03:14 on console
qbi82@netpanel-87-246-223-175 ~ % where sikarugir
sikarugir not found
qbi82@netpanel-87-246-223-175 ~ % where
qbi82@netpanel-87-246-223-175 ~ % where terminal
terminal not found
qbi82@netpanel-87-246-223-175 ~ % where Terminal
Terminal not found
qbi82@netpanel-87-246-223-175 ~ % git
usage: git [-v | --version] [-h | --help] [-C <path>] [-c <name>=<value>]
[--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]
[-p | --paginate | -P | --no-pager] [--no-replace-objects] [--no-lazy-fetch]
[--no-optional-locks] [--no-advice] [--bare] [--git-dir=<path>]
[--work-tree=<path>] [--namespace=<name>] [--config-env=<name>=<envvar>]
<command> [<args>]
These are common Git commands used in various situations:
start a working area (see also: git help tutorial)
clone Clone a repository into a new directory
init Create an empty Git repository or reinitialize an existing one
work on the current change (see also: git help everyday)
add Add file contents to the index
mv Move or rename a file, a directory, or a symlink
restore Restore working tree files
rm Remove files from the working tree and from the index
examine the history and state (see also: git help revisions)
bisect Use binary search to find the commit that introduced a bug
diff Show changes between commits, commit and working tree, etc
grep Print lines matching a pattern
log Show commit logs
show Show various types of objects
status Show the working tree status
grow, mark and tweak your common history
backfill Download missing objects in a partial clone
branch List, create, or delete branches
commit Record changes to the repository
merge Join two or more development histories together
rebase Reapply commits on top of another base tip
reset Reset current HEAD to the specified state
switch Switch branches
tag Create, list, delete or verify a tag object signed with GPG
collaborate (see also: git help workflows)
fetch Download objects and refs from another repository
pull Fetch from and integrate with another repository or a local branch
push Update remote refs along with associated objects
'git help -a' and 'git help -g' list available subcommands and some
concept guides. See 'git help <command>' or 'git help <concept>'
to read about a specific subcommand or concept.
See 'git help git' for an overview of the system.
qbi82@netpanel-87-246-223-175 ~ % ls
Applications IdeaProjects Modules Pictures VSCode
Desktop Library Movies Programs config.log
Documents Makefile Music Public config.status
Downloads Makefile.pre Objects Python pyconfig.h
Games Misc Parser Templates
qbi82@netpanel-87-246-223-175 ~ % cd Documents
qbi82@netpanel-87-246-223-175 Documents % ls
1.docx hubert.docx
League of Legends integracja poprawa.docx
Nowy Katalog integracja_zalozenia_z_labow.docx
Steam ios_proj.rtf
Untitled 2.png projekt_IOS_99719_99720.pdf
Untitled.rtf wstepny_projekt_integracja_docker.docx
qbi82@netpanel-87-246-223-175 Documents % mkdir Git_Laby
qbi82@netpanel-87-246-223-175 Documents % cd Git_Laby
qbi82@netpanel-87-246-223-175 Git_Laby % sudo port install git
Password:
sudo: port: command not found
qbi82@netpanel-87-246-223-175 Git_Laby % brew install git
==> Auto-updating Homebrew...
Adjust how often this is run with `$HOMEBREW_AUTO_UPDATE_SECS` or disable with
`$HOMEBREW_NO_AUTO_UPDATE=1`. Hide these hints with `$HOMEBREW_NO_ENV_HINTS=1` (see `man brew`).
==> Auto-updated Homebrew!
Updated 1 tap (homebrew/cask).
==> New Casks
liquibase-community: Library for database change tracking
liquibase-secure: Database change management tool
Warning: git 2.51.0 is already installed and up-to-date.
To reinstall 2.51.0, run:
brew reinstall git
qbi82@netpanel-87-246-223-175 Git_Laby % cd demo
qbi82@netpanel-87-246-223-175 demo % nano Readme.txt
qbi82@netpanel-87-246-223-175 demo % ls
HELP.md mvnw pom.xml
Readme.txt mvnw.cmd src
qbi82@netpanel-87-246-223-175 demo % rm Readme.txt
qbi82@netpanel-87-246-223-175 demo % ls
HELP.md mvnw.cmd src
mvnw pom.xml
qbi82@netpanel-87-246-223-175 demo % git init
hint: Using 'master' as the name for the initial branch. This default branch name
hint: is subject to change. To configure the initial branch name to use in all
hint: of your new repositories, which will suppress this warning, call:
hint:
hint: git config --global init.defaultBranch <name>
hint:
hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and
hint: 'development'. The just-created branch can be renamed via this command:
hint:
hint: git branch -m <name>
hint:
hint: Disable this message with "git config set advice.defaultBranchName false"
Initialized empty Git repository in /Users/qbi82/Documents/Git_Laby/demo/.git/
qbi82@netpanel-87-246-223-175 demo % rm Readme.txt
rm: Readme.txt: No such file or directory
qbi82@netpanel-87-246-223-175 demo % nano Readme.txt
qbi82@netpanel-87-246-223-175 demo % ls
HELP.md mvnw.cmd src
mvnw pom.xml
qbi82@netpanel-87-246-223-175 demo % ls
HELP.md mvnw.cmd src
mvnw pom.xml
qbi82@netpanel-87-246-223-175 demo % nano Readme.txt
qbi82@netpanel-87-246-223-175 demo % ls
HELP.md mvnw pom.xml
Readme.txt mvnw.cmd src
qbi82@netpanel-87-246-223-175 demo % git add Readme.txt
qbi82@netpanel-87-246-223-175 demo % git commit -m "Added Readme.txt to the repository"
[master (root-commit) 963bfb4] Added Readme.txt to the repository
1 file changed, 0 insertions(+), 0 deletions(-)
create mode 100644 Readme.txt
qbi82@netpanel-87-246-223-175 demo % git status
On branch master
Untracked files:
(use "git add <file>..." to include in what will be committed)
.gitattributes
.gitignore
.mvn/
mvnw
mvnw.cmd
pom.xml
src/
nothing added to commit but untracked files present (use "git add" to track)
qbi82@netpanel-87-246-223-175 demo % git status --short
?? .gitattributes
?? .gitignore
?? .mvn/
?? mvnw
?? mvnw.cmd
?? pom.xml
?? src/
qbi82@netpanel-87-246-223-175 demo % nano .gitignore
qbi82@netpanel-87-246-223-175 demo % git add --all
warning: in the working copy of 'mvnw.cmd', LF will be replaced by CRLF the next time Git touches it
qbi82@netpanel-87-246-223-175 demo % git status
On branch master
Changes to be committed:
(use "git restore --staged <file>..." to unstage)
new file: .gitattributes
new file: .gitignore
new file: .mvn/wrapper/maven-wrapper.properties
new file: mvnw
new file: mvnw.cmd
new file: pom.xml
new file: src/main/java/com/example/demo/DemoApplication.java
new file: src/main/resources/application.properties
new file: src/test/java/com/example/demo/DemoApplicationTests.java
qbi82@netpanel-87-246-223-175 demo % git status
On branch master
Changes to be committed:
(use "git restore --staged <file>..." to unstage)
new file: .gitattributes
new file: .gitignore
new file: .mvn/wrapper/maven-wrapper.properties
new file: mvnw
new file: mvnw.cmd
new file: pom.xml
new file: src/main/java/com/example/demo/DemoApplication.java
new file: src/main/resources/application.properties
new file: src/test/java/com/example/demo/DemoApplicationTests.java
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: src/main/java/com/example/demo/DemoApplication.java
qbi82@netpanel-87-246-223-175 demo % git add Readme\ copy.txt
qbi82@netpanel-87-246-223-175 demo % git commit -m "Added Readme\ copy.txt to the repository"
[master 927ac7f] Added Readme\ copy.txt to the repository
10 files changed, 603 insertions(+)
create mode 100644 .gitattributes
create mode 100644 .gitignore
create mode 100644 .mvn/wrapper/maven-wrapper.properties
create mode 100644 Readme copy.txt
create mode 100755 mvnw
create mode 100644 mvnw.cmd
create mode 100644 pom.xml
create mode 100644 src/main/java/com/example/demo/DemoApplication.java
create mode 100644 src/main/resources/application.properties
create mode 100644 src/test/java/com/example/demo/DemoApplicationTests.java
qbi82@netpanel-87-246-223-175 demo % log
usage:
log <command>
global options:
-?, --help
-q, --quiet
-v, --verbose
commands:
collect gather system logs into a log archive
config view/change logging system settings
diagnose diagnose an archive for a variety of issues
erase delete system logging data
repack repack a log archive using a predicate
show view/search system logs
stream watch live system logs
stats show system logging statistics
further help:
log help <command>
log help predicates
log help shorthand
qbi82@netpanel-87-246-223-175 demo % git log
commit 927ac7f180751c662a61a3ad33b9ab5bd9577dda (HEAD -> master)
Author: s99719 <s99719@pollub.edu.pl>
Date: Tue Oct 14 13:33:01 2025 +0200
Added Readme\ copy.txt to the repository
commit 963bfb4160c61ef1b1f5b841809655c77d7bcc0a
Author: s99719 <s99719@pollub.edu.pl>
Date: Tue Oct 14 13:28:29 2025 +0200
Added Readme.txt to the repository
qbi82@netpanel-87-246-223-175 demo % git status --short
M src/main/java/com/example/demo/DemoApplication.java
?? .DS_Store
qbi82@netpanel-87-246-223-175 demo % 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: src/main/java/com/example/demo/DemoApplication.java
Untracked files:
(use "git add <file>..." to include in what will be committed)
.DS_Store
no changes added to commit (use "git add" and/or "git commit -a")
qbi82@netpanel-87-246-223-175 demo % git branch dev1
qbi82@netpanel-87-246-223-175 demo % git branch
dev1
* master
qbi82@netpanel-87-246-223-175 demo % git checkout dev1
M src/main/java/com/example/demo/DemoApplication.java
Switched to branch 'dev1'
qbi82@netpanel-87-246-223-175 demo % git add --all
qbi82@netpanel-87-246-223-175 demo % git commit -m "added UserController"
[dev1 2d067fe] added UserController
3 files changed, 6 insertions(+)
create mode 100644 .DS_Store
create mode 100644 src/main/java/com/example/demo/controller/UserController.java
qbi82@netpanel-87-246-223-175 demo % git status
On branch dev1
nothing to commit, working tree clean
qbi82@netpanel-87-246-223-175 demo % git status --short
qbi82@netpanel-87-246-223-175 demo % git log
commit 2d067feb80d67bb5a1be4673ac2c4312b0340b3d (HEAD -> dev1)
Author: s99719 <s99719@pollub.edu.pl>
Date: Tue Oct 14 13:40:47 2025 +0200
added UserController
commit 927ac7f180751c662a61a3ad33b9ab5bd9577dda (master)
Author: s99719 <s99719@pollub.edu.pl>
Date: Tue Oct 14 13:33:01 2025 +0200
Added Readme\ copy.txt to the repository
commit 963bfb4160c61ef1b1f5b841809655c77d7bcc0a
Author: s99719 <s99719@pollub.edu.pl>
Date: Tue Oct 14 13:28:29 2025 +0200
Added Readme.txt to the repository
qbi82@netpanel-87-246-223-175 demo % ls
HELP.md mvnw src
Readme copy.txt mvnw.cmd
Readme.txt pom.xml
qbi82@netpanel-87-246-223-175 demo % cd src
qbi82@netpanel-87-246-223-175 src % ls
main test
qbi82@netpanel-87-246-223-175 src % cd main
qbi82@netpanel-87-246-223-175 main % ls
java resources
qbi82@netpanel-87-246-223-175 main % cd java
qbi82@netpanel-87-246-223-175 java % ls
com
qbi82@netpanel-87-246-223-175 java % cd com
qbi82@netpanel-87-246-223-175 com % ls
example
qbi82@netpanel-87-246-223-175 com % cd example
qbi82@netpanel-87-246-223-175 example % ls
demo
qbi82@netpanel-87-246-223-175 example % cd cd
cd: no such file or directory: cd
qbi82@netpanel-87-246-223-175 example % cd demo
qbi82@netpanel-87-246-223-175 demo % ls
DemoApplication.java controller
qbi82@netpanel-87-246-223-175 demo % cd ..
qbi82@netpanel-87-246-223-175 example % cd ..
qbi82@netpanel-87-246-223-175 com % cd..
zsh: command not found: cd..
qbi82@netpanel-87-246-223-175 com % cd..
zsh: command not found: cd..
qbi82@netpanel-87-246-223-175 com % cd ..
qbi82@netpanel-87-246-223-175 java % cd ..
qbi82@netpanel-87-246-223-175 main % cd ..
qbi82@netpanel-87-246-223-175 src % cd ..
qbi82@netpanel-87-246-223-175 demo % git branch
* dev1
master
qbi82@netpanel-87-246-223-175 demo % git branch master
fatal: a branch named 'master' already exists
qbi82@netpanel-87-246-223-175 demo % git checkout master
Switched to branch 'master'
qbi82@netpanel-87-246-223-175 demo % git branch dev2
qbi82@netpanel-87-246-223-175 demo % git branch
dev1
dev2
* master
qbi82@netpanel-87-246-223-175 demo % git branch dev2
fatal: a branch named 'dev2' already exists
qbi82@netpanel-87-246-223-175 demo % git checkout dev2
Switched to branch 'dev2'
qbi82@netpanel-87-246-223-175 demo % git add --all
qbi82@netpanel-87-246-223-175 demo % git status
On branch dev2
Changes to be committed:
(use "git restore --staged <file>..." to unstage)
modified: src/main/java/com/example/demo/DemoApplication.java
new file: src/main/java/com/example/demo/domain/UserEntity.java
qbi82@netpanel-87-246-223-175 demo % git commit -m "added UserEntity"
[dev2 ab24701] added UserEntity
2 files changed, 5 insertions(+)
create mode 100644 src/main/java/com/example/demo/domain/UserEntity.java
qbi82@netpanel-87-246-223-175 demo % git checkout master
Switched to branch 'master'
qbi82@netpanel-87-246-223-175 demo % git merge dev2
Updating 927ac7f..ab24701
Fast-forward
.../com/example/demo/DemoApplication.java | 1 +
.../com/example/demo/domain/UserEntity.java | 4 ++++
2 files changed, 5 insertions(+)
create mode 100644 src/main/java/com/example/demo/domain/UserEntity.java
qbi82@netpanel-87-246-223-175 demo % git branch -d dev2
Deleted branch dev2 (was ab24701).
qbi82@netpanel-87-246-223-175 demo % git checkout master
Already on 'master'
qbi82@netpanel-87-246-223-175 demo % git merge dev1
Auto-merging src/main/java/com/example/demo/DemoApplication.java
CONFLICT (content): Merge conflict in src/main/java/com/example/demo/DemoApplication.java
Automatic merge failed; fix conflicts and then commit the result.
qbi82@netpanel-87-246-223-175 demo % git commit -m "merged"
[master 64856bd] merged
qbi82@netpanel-87-246-223-175 demo % git branch dev3
qbi82@netpanel-87-246-223-175 demo % git checkout dev3
Switched to branch 'dev3'
qbi82@netpanel-87-246-223-175 demo % git add --all
qbi82@netpanel-87-246-223-175 demo % git branch dev4
qbi82@netpanel-87-246-223-175 demo % git checkout dev4
M src/main/java/com/example/demo/DemoApplication.java
Switched to branch 'dev4'
qbi82@netpanel-87-246-223-175 demo % git add --all
qbi82@netpanel-87-246-223-175 demo % git checkout dev3
M src/main/java/com/example/demo/DemoApplication.java
Switched to branch 'dev3'
qbi82@netpanel-87-246-223-175 demo % git commit -m "added line12"
[dev3 754ffe1] added line12
1 file changed, 4 insertions(+), 1 deletion(-)
qbi82@netpanel-87-246-223-175 demo % git checkout dev4
Switched to branch 'dev4'
qbi82@netpanel-87-246-223-175 demo % git commit -m "added comm"
On branch dev4
nothing to commit, working tree clean
qbi82@netpanel-87-246-223-175 demo % git checkout master
Switched to branch 'master'
qbi82@netpanel-87-246-223-175 demo % git branch -d dev3
error: the branch 'dev3' is not fully merged
hint: If you are sure you want to delete it, run 'git branch -D dev3'
hint: Disable this message with "git config set advice.forceDeleteBranch false"
qbi82@netpanel-87-246-223-175 demo % git checkout dev3
Switched to branch 'dev3'
qbi82@netpanel-87-246-223-175 demo % git add -all
error: did you mean `--all` (with two dashes)?
qbi82@netpanel-87-246-223-175 demo % git add --all
qbi82@netpanel-87-246-223-175 demo % git commit -m "added prntln"
On branch dev3
nothing to commit, working tree clean
qbi82@netpanel-87-246-223-175 demo % git checkout master
Switched to branch 'master'
qbi82@netpanel-87-246-223-175 demo % git merge dev3
Updating 64856bd..754ffe1
Fast-forward
.../com/example/demo/DemoApplication.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
qbi82@netpanel-87-246-223-175 demo % git merge dev4
Already up to date.
qbi82@netpanel-87-246-223-175 demo % git branch -D dev3
Deleted branch dev3 (was 754ffe1).
qbi82@netpanel-87-246-223-175 demo % git branch -D dev4
Deleted branch dev4 (was 64856bd).
qbi82@netpanel-87-246-223-175 demo %