Skip to content

Changes

Page history
Add paragraph about git pull authored by Administrator's avatar Administrator
Hide whitespace changes
Inline Side-by-side
git-setup.md
View page @ d4516b8d
......@@ -14,7 +14,7 @@ You can see a list of all groups here https://webis16.medien.uni-weimar.de/gitla
Each former CVS module on the second level of the hierarchy is now a *project* in GitLab, and has its own Git repository. For example, the project `code-in-progress/webisstud/wstud-clickbait-ws16` is now project `wstud-clickbait-ws16` in group `webisstud` with the URL https://webis16.medien.uni-weimar.de/gitlab/webisstud/wstud-clickbait-ws16
# 3 Authentication And Cloning Projects
# 3 Authentication, Cloning and Updating Projects
Each project page displays a clone URL under the project name. Two methods are supported: SSH and HTTPS, which have different clone URLs. The HTTPS method only uses your username and password. The SSH method is more convenient, but requires some up-front setup. You need to generate an SSH key pair, and make the public key known to GitLab. If you don't have an SSH-key pair, you can generate one by running
```
......@@ -41,6 +41,8 @@ git clone git@webis.uni-weimar.de:webisstud/wstud-clickbait-ws16.git
Both URLs can be looked up and copied from the project page in GitLab.
To update an already cloned working copy with the latest changes from GitLab, use `git pull` to pull in the latest remote revision. `git pull` is a shortcut for `git fetch`, which retrieves the changes from the server, and `git merge`, which merges the fetched changes into your local working copy.
## 3.1 Note to Former CVS Users
Please be aware that, unlike CVS or SVN, Git is a *distributed* version control system. That means that a `git commit` only commits into your local working copy. To push the changes back to our central GitLab instance, you have to use `git push` after committing your changes. It is strongly recommended to commit often and in small atomic units with meaningful commit messages. That way you document your work progress and create a comprehensible history. Once your work is finished or at the end of a work day, you can bulk-push all your commits back to the server with a single `git push` (of course you can push more often if you like).
......