From 7fc4c253acba8d8580326962b49dc46cdbcb07d6 Mon Sep 17 00:00:00 2001 From: Bourdel Laurent <laurent.bourdel@insa-rennes.fr> Date: Wed, 14 Nov 2018 16:26:50 +0100 Subject: [PATCH] 2nd README updated --- README.md | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index f4c91cf..30f3b28 100644 --- a/README.md +++ b/README.md @@ -62,48 +62,49 @@ git remote rename origin origin-teacher git remote add origin ssh://git@gitlab.insa-rennes.fr:16022/EmbeddedLinux_Group/4CDTI-P2020-<YourName>-LabUdooNeo git remote -v -7/ Push your local directory to your personal repo +7/ Push your local directory to your personal repo in terminal window git status git push -u origin --all git push -u origin --tags git status -9/ Check if your local repo is pushed on Gitlab repo +9/ Check if your local repo is pushed on Gitlab repo on web browser OK ? -10/ Submit your LAB codes (cd /H/STM32_Peripheral_LAB/MyGitWorkingFolder) +10/ Submit your LAB codes in terminal window git add . git status -11/ Commit your modification when needed +11/ Commit your modification when needed in terminal window git commit -a -m "message to explain commit content" or git commit -a (vim command : 'i' to insert, 'ESC' to leave edit mode, ':wq' to save commit message) -12/ CPush your modification on GitLab server - -git remote -v - -git remote add origin ssh://git@gitlab.insa-rennes.fr:16022/EmbeddedLinux_Group/4CDTI-P2020-<YourName>-LabUdooNeo +12/ Push your modification on GitLab server in terminal window git push origin master -13/ Check on GitLab server "new activity" +git log +git log -p +git log --stat + +13/ Check on GitLab server "new activity" on web browser -14/ If Teacher updated repo, +14/ If Teacher updates repo, in terminal window get modification's historical from remote repo : git fetch origin-teacher master -check modifications by : git diff --name-only master origin/master +check modifications by : git diff --name-only master origin-teacher/master -update (merge) modif by : git pull origin master +update (merge) modif by : git pull origin-teacher master !!! Well Done !!! +// Initial README Command line instructions -- GitLab