git-basic-setup.md

@@ -9,7 +9,7 @@ In windows, use [git terminal app](https://git-for-windows.github.io/) applicati
 ```bash
 git clone https://gitlab.fi.muni.cz/pb162/2017-pb162-seminar-project.git
 cd 2017-pb162-seminar-project
-git pull origin iteration-00 -X theirs --rebase
+git pull origin iteration-00 -X theirs 
 ```
 >
 **In Netbeans:**