Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
courses
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Nene Barry
courses
Commits
5bb44195
Verified
Commit
5bb44195
authored
5 years ago
by
Laurent Heirendt
Browse files
Options
Downloads
Patches
Plain Diff
remove configuration slides
parent
2a603a65
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
2019/2019-10-10_advancedGitTraining-SIU/slides/gettingStarted.md
+6
-69
6 additions, 69 deletions
...19-10-10_advancedGitTraining-SIU/slides/gettingStarted.md
with
6 additions
and
69 deletions
2019/2019-10-10_advancedGitTraining-SIU/slides/gettingStarted.md
+
6
−
69
View file @
5bb44195
# Getting Started (1)
Make sure that your git is configured properly:
```
bash
$
git config
--global
user.name
"Firstname Lastname"
$
git config
--global
user.email
"first.last@uni.lu"
```
Test whether your username and email have been registered
```
bash
$
git config
--list
```
# Getting Started
Fork and then clone the tutorial repository
<a
href=
"https://git
-r3lab.uni.lu/R3/school/git
/advanced-practice"
>
https://git
-r3lab.uni.lu/R3/school/git
/advanced-practice
</a>
<a
href=
"https://git
hub.com/LCSB-BioCore
/advanced-
git-
practice"
>
https://git
hub.com/LCSB-BioCore
/advanced-
git-
practice
</a>
```
bash
$
git clone
ssh://
git@git
-r3lab-server.uni.lu:8022/
<first.last>/advanced-practice.git
$
git clone git@git
hub.com:
<first.last>/advanced-
git-
practice.git
```
# Getting Started (2)
*
Please generate your SSH before with
`$ ssh-keygen -t rsa`
and set it in Gitlab!
*
Add a remote
`upstream`
```
bash
$
cd
advanced-practice
$
cd
advanced-
git-
practice
# add upstream URL
$
git remote add upstream
ssh://
git@git
-r3lab-server.uni.lu:8022/R3/school/git
/advanced-practice.git
$
git remote add upstream git@git
hub.com:<first.last>
/advanced-
git-
practice.git
$
git fetch upstream
```
*
Check the remotes with:
...
...
@@ -42,48 +23,4 @@ $ git clone ssh://git@git-r3lab-server.uni.lu:8022/<first.last>/advanced-practic
```
bash
$
git checkout
-b
develop upstream/develop
$
git checkout
-b
myBranch
```
# Install the mergetool `kdiff3`
*
Download it here: http://kdiff3.sourceforge.net/
*
Setting up
`kdiff3`
:
```
bash
$
git config
--global
--add
merge.tool kdiff3
$
git config
--global
--add
mergetool.kdiff3.path
"<kdiff3 path>"
```
*
omit
`""`
when setting up on Linux or macOS
**Note**
: On UNIX, you can find the path of
`kdiff3`
by typing:
```
bash
$
which kdiff3
```
On Windows, the path might be
`C:/Program Files/KDiff3/kdiff3.exe`
.
# A note on common commands:
This workshop will not cover in detail the following commands, assuming you are familiar with them:
-
`git checkout`
-
`git add`
-
`git commit`
-
`git log`
-
`git show`
Feel free to ask any questions if you run into any issues!
For your reference:
```
bash
$
git <
command
>
--help
```
Replace
`<command>`
with the command you want help for.
Exit with
`q`
```
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment