Commit 91fe4337 authored by Matúš Fedorko's avatar Matúš Fedorko
Browse files

Merge branch mastering-git:main into hw2

parents 943bf21d 97749258
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
# Mastering Git course

Complicated pull.

![xkcd Git](https://explainxkcd.com/wiki/images/4/4d/git.png)

6 weeks course on mastering git.
+8 −0
Original line number Diff line number Diff line
I like your interactiveness at the seminars - it forces a student to really pay an attention since he/she can be another victim of a pick!

One of the things you've learned me was the story behind git stash command: I've always took it as some special object. However, as you said, internally it's rather implemented as a special branch, since git developers wanted to reuse the existing API above branches they already had.

During the course, I've realized I want to also understand better how git works internally. I'll start to read Git Internals chapter of Pro Git book probably very soon.
Do you have any other recommendations guys?

Didn't really feel like something would miss (except internet connection at the last seminar for a while :D). Keep doing the great job!
+9 −0
Original line number Diff line number Diff line
git fetch origin
git status
git log
git checkout HEAD~2
git switch -c submit-hw-03
vi 492892.txt
git add 492892.txt
git commit -m "Add file with my answers"
git push -u origin submit-hw-03
+4 −0
Original line number Diff line number Diff line
So far I am always looking forward to attend the seminar and I am enjoying it overall.
I like how you are showing live demo to almost each topic and try to ask us questions about it.
I finally understand how remotes work, how to use ssh keys and how to work with branches.
However, there are not many examples of situations where things go wrong and we encounter conflicts or some other errors. I would like to see them too and get to know how to fix them.
+26 −0
Original line number Diff line number Diff line
cd PV177_Git/
ls
cd mastering-git/
ls
git status
git remote -v
git switch main
git status
git branch homework_03
git switch homework_03
git status
ls
mkdir class3_homework
cd class3_homework/
ls
git status
touch 524847.txt
cat 524847.txt
ls
git status
ls
git add .
git status
git commit -m "added course feedback"
git push
history | awk '{$1=""; sub(/^[[:space:]]/, ""); print}' | tail -n 55 > 524847_commands.txt