tasks/galezie.console.log

user@debian:~/testy/galezie$ 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>
Initialized empty Git repository in /home/user/testy/galezie/.git/
user@debian:~/testy/galezie$ Aby utworzyć nowe repozytorium Git w nowym folderze na git init
                             ^C
user@debian:~/testy/galezie$ echo "Linia 1 - Główna gałąź" > plik.txt
user@debian:~/testy/galezie$ git add plik.txt
user@debian:~/testy/galezie$ git commit -m "Pierwszy commit na głównej gałęzi"
[master (root-commit) 871c621] Pierwszy commit na głównej gałęzi
 Committer: user <user@debian.myguest.virtualbox.org>
Your name and email address were configured automatically based
on your username and hostname. Please check that they are accurate.
You can suppress this message by setting them explicitly:

    git config --global user.name "Your Name"
    git config --global user.email you@example.com

After doing this, you may fix the identity used for this commit with:

    git commit --amend --reset-author

 1 file changed, 1 insertion(+)
 create mode 100644 plik.txt
user@debian:~/testy/galezie$ git branch nowa-galaz
user@debian:~/testy/galezie$ git checkout nowa-galaz
Switched to branch 'nowa-galaz'
user@debian:~/testy/galezie$ echo "Linia 2 - Nowa gałąź" >> plik.txt
user@debian:~/testy/galezie$ git add plik.txt
user@debian:~/testy/galezie$ git commit -m "Dodano linię w nowej gałęzi"
[nowa-galaz 6b6b92f] Dodano linię w nowej gałęzi
 Committer: user <user@debian.myguest.virtualbox.org>
Your name and email address were configured automatically based
on your username and hostname. Please check that they are accurate.
You can suppress this message by setting them explicitly:

    git config --global user.name "Your Name"
    git config --global user.email you@example.com

After doing this, you may fix the identity used for this commit with:

    git commit --amend --reset-author

 1 file changed, 1 insertion(+)
user@debian:~/testy/galezie$ git checkout main
error: pathspec 'main' did not match any file(s) known to git
user@debian:~/testy/galezie$ echo "Linia 2 - Główna gałąź" >> plik.txt
user@debian:~/testy/galezie$ git add plik.txt
user@debian:~/testy/galezie$ git commit -m "Dodano linię w głównej gałęzi"
[nowa-galaz 54b696d] Dodano linię w głównej gałęzi
 Committer: user <user@debian.myguest.virtualbox.org>
Your name and email address were configured automatically based
on your username and hostname. Please check that they are accurate.
You can suppress this message by setting them explicitly:

    git config --global user.name "Your Name"
    git config --global user.email you@example.com

After doing this, you may fix the identity used for this commit with:

    git commit --amend --reset-author

 1 file changed, 1 insertion(+)
user@debian:~/testy/galezie$ git merge nowa-galaz
Already up to date.
user@debian:~/testy/galezie$ nano 
.git/     plik.txt  
user@debian:~/testy/galezie$ nano plik.txt 
user@debian:~/testy/galezie$ git add plik.txt
user@debian:~/testy/galezie$ git commit -m "Rozwiązano konflikt i scalono nową gałąź"
[nowa-galaz 3d41e30] Rozwiązano konflikt i scalono nową gałąź
 Committer: user <user@debian.myguest.virtualbox.org>
Your name and email address were configured automatically based
on your username and hostname. Please check that they are accurate.
You can suppress this message by setting them explicitly:

    git config --global user.name "Your Name"
    git config --global user.email you@example.com

After doing this, you may fix the identity used for this commit with:

    git commit --amend --reset-author

 1 file changed, 1 insertion(+), 2 deletions(-)
user@debian:~/testy/galezie$ git log --oneline --graph
* 3d41e30 (HEAD -> nowa-galaz) Rozwiązano konflikt i scalono nową gałąź
* 54b696d Dodano linię w głównej gałęzi
* 6b6b92f Dodano linię w nowej gałęzi
* 871c621 (master) Pierwszy commit na głównej gałęzi
user@debian:~/testy/galezie$ git remote add origin https://gitsr.dmcs.pl/itaz24-1/galezie.git
user@debian:~/testy/galezie$ git push -u origin master
Username for 'https://gitsr.dmcs.pl': itaz24-1 
Password for 'https://itaz24-1@gitsr.dmcs.pl': 
Enumerating objects: 3, done.
Counting objects: 100% (3/3), done.
Writing objects: 100% (3/3), 274 bytes | 274.00 KiB/s, done.
Total 3 (delta 0), reused 0 (delta 0), pack-reused 0
To https://gitsr.dmcs.pl/itaz24-1/galezie.git
 * [new branch]      master -> master
branch 'master' set up to track 'origin/master'.