Update git basic setup authored by Radek Ošlejšek's avatar Radek Ošlejšek
...@@ -6,7 +6,7 @@ If you have a trouble getting the assignment, you can always go to GitLab projec ...@@ -6,7 +6,7 @@ If you have a trouble getting the assignment, you can always go to GitLab projec
In windows, use [git terminal app](https://git-for-windows.github.io/) application. In windows, use [git terminal app](https://git-for-windows.github.io/) application.
``` ```bash
git clone https://gitlab.fi.muni.cz/pb162/2017-pb162-seminar-project.git git clone https://gitlab.fi.muni.cz/pb162/2017-pb162-seminar-project.git
cd 2017-pb162-seminar-project cd 2017-pb162-seminar-project
git pull origin iteration-00 -X theirs --rebase git pull origin iteration-00 -X theirs --rebase
...@@ -24,7 +24,7 @@ Every week, we add a new iteration with described assignment what you have to do ...@@ -24,7 +24,7 @@ Every week, we add a new iteration with described assignment what you have to do
If you want to get the assignment use pull command: If you want to get the assignment use pull command:
``` ```bash
git pull origin iteration-0X -X theirs --rebase git pull origin iteration-0X -X theirs --rebase
``` ```
> >
...@@ -37,7 +37,7 @@ git pull origin iteration-0X -X theirs --rebase ...@@ -37,7 +37,7 @@ git pull origin iteration-0X -X theirs --rebase
To make sure that everything is okay, use `git status`, which is pretty useful: To make sure that everything is okay, use `git status`, which is pretty useful:
``` ```bash
git status git status
``` ```
> >
...@@ -53,7 +53,7 @@ Follow [instructions on GitLab](https://gitlab.fi.muni.cz/pb162/2017-pb162-semin ...@@ -53,7 +53,7 @@ Follow [instructions on GitLab](https://gitlab.fi.muni.cz/pb162/2017-pb162-semin
You can do it multiple times. Always check that you added/changed only classes mentioned in the assignment. Changing other classes may produce conflicts when downloading new iteration! You can do it multiple times. Always check that you added/changed only classes mentioned in the assignment. Changing other classes may produce conflicts when downloading new iteration!
``` ```bash
git add -A && git commit -m "Shortly describe what have you done." git add -A && git commit -m "Shortly describe what have you done."
``` ```
> >
...@@ -63,7 +63,7 @@ git add -A && git commit -m "Shortly describe what have you done." ...@@ -63,7 +63,7 @@ git add -A && git commit -m "Shortly describe what have you done."
> >
Then you can look at your changes what you have done Then you can look at your changes what you have done
``` ```bash
git diff --staged git diff --staged
``` ```
... ...
......