From 93d8d5833d099d1bb2880e1eb0185f1815c1b2fb Mon Sep 17 00:00:00 2001 From: Frank Steinberg <steinberg@ibr.cs.tu-bs.de> Date: Thu, 10 Oct 2019 13:44:11 +0200 Subject: [PATCH] Updates. --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d38cb00..a93c4b8 100644 --- a/README.md +++ b/README.md @@ -94,9 +94,11 @@ For an ongoing distributed translation process, it is possible to install this p ``` git remote add web ssh://frank@zbox.ibr.cs.tu-bs.de/var/www/bjcp-2015-styleguide ``` -and then pull its updates whenever you want: +and then fetch its updates whenever you want, compare it, merge it, ... (again, this text cannot replace a Git tutorial): ``` -git pull web master +git fetch web +git diff master web/master +git merge web/master ``` ## Contact -- GitLab