Commits · 8b563ae07ec47d4eef93cf7cd44a57368cb9cda9 · R3 / school / courses

23 Sep, 2019 14 commits
- Merge branch 'advanced-training' into 'develop' · 8b563ae0
  Laurent Heirendt authored Sep 23, 2019
```
Advanced training slides

See merge request !44
```
  8b563ae0
- changes in config of kdiff3 · 2ef04024
  Laurent Heirendt authored Sep 23, 2019
  
  2ef04024
- add example for cherry-picking a conflict · 016c2753
  Laurent Heirendt authored Sep 23, 2019
  
  016c2753
- installation instructions for kdiff3, and example for solving conflict on local merge · 94a4f27b
  Laurent Heirendt authored Sep 23, 2019
  
  94a4f27b
- redo merge slide · 82911dea
  Laurent Heirendt authored Sep 23, 2019
  
  82911dea
- overall changes to fit partial cherry-picking and note on common commands · 31c46285
  Laurent Heirendt authored Sep 23, 2019
  
  31c46285
- adapt the slides for cherr-picking · 75163cf0
  Laurent Heirendt authored Sep 23, 2019
  
  75163cf0
- example 2 of rebase · c3ce4d6a
  Laurent Heirendt authored Sep 23, 2019
  
  c3ce4d6a
- fix slides of rebase · dbdef34d
  Laurent Heirendt authored Sep 23, 2019
  
  dbdef34d
- new images for rebase · 46164b0c
  Laurent Heirendt authored Sep 23, 2019
  
  46164b0c
- slide for reverting a commit · 5639f48a
  Laurent Heirendt authored Sep 23, 2019
  
  5639f48a
- change order of slides · e90b37ac
  Laurent Heirendt authored Sep 23, 2019
  
  e90b37ac
- adaptations to reset · 69226386
  Laurent Heirendt authored Sep 23, 2019
  
  69226386
- minor changes in titles for amend · b25fcf3e
  Laurent Heirendt authored Sep 23, 2019
  
  b25fcf3e
20 Sep, 2019 6 commits
- change overview list · 7b7a63c7
  Laurent Heirendt authored Sep 20, 2019
  
  7b7a63c7
- change title · cc35c558
  Laurent Heirendt authored Sep 20, 2019
  
  cc35c558
- change order of slides · 2d01fa00
  Laurent Heirendt authored Sep 20, 2019
  
  2d01fa00
- changes in getting started section · d788b33d
  Laurent Heirendt authored Sep 20, 2019
  
  d788b33d
- changes in amend section · a33e1206
  Laurent Heirendt authored Sep 20, 2019
  
  a33e1206
- change of instructions for getting started · 62221bfd
  Laurent Heirendt authored Sep 20, 2019
  
  62221bfd
19 Sep, 2019 20 commits
- Merge branch 'linux-course' into 'develop' · f6f15294
  Laurent Heirendt authored Sep 19, 2019
```
Linux course - outline from Todor

See merge request !43
```
  f6f15294
- register readme as outline · 147e195c
  Laurent Heirendt authored Sep 19, 2019
  
  147e195c
- rename readme to outline.md · 3a20bb25
  Laurent Heirendt authored Sep 19, 2019
  
  3a20bb25
- preliminary git course · 8a27a1c5
  Laurent Heirendt authored Sep 19, 2019
  
  8a27a1c5
- Update README.org · 17877c3c
  Todor Kondic authored Jun 05, 2019 and Laurent Heirendt committed Sep 19, 2019
  
  17877c3c
- Add new file · 9690d03f
  Todor Kondic authored Jun 05, 2019 and Laurent Heirendt committed Sep 19, 2019
  
  9690d03f
- Merge branch 'advanced-slides' into 'develop' · 123da439
  Laurent Heirendt authored Sep 19, 2019
```
Preliminary slides for advanced git training

See merge request !42
```
  123da439
- update theme submodule · 0b429241
  Laurent Heirendt authored Sep 19, 2019
  
  0b429241
- changes names of files in list · 09b884b6
  Laurent Heirendt authored Sep 19, 2019
  
  09b884b6
- renaming files · 70a9c286
  Laurent Heirendt authored Sep 19, 2019
  
  70a9c286
- merge intro and presentation slides · bf04f7f8
  Laurent Heirendt authored Sep 19, 2019
  
  bf04f7f8
- combining slides · 67625ca0
  Laurent Heirendt authored Sep 19, 2019
  
  67625ca0
- simplifications · 17b70034
  Laurent Heirendt authored Sep 19, 2019
  
  17b70034
- simplifications of slides · a86258b8
  Laurent Heirendt authored Sep 19, 2019
  
  a86258b8
- simplifications of slides · cdba2c73
  Laurent Heirendt authored Sep 19, 2019
  
  cdba2c73
- change index and overview+ · 82d5bfd7
  Laurent Heirendt authored Sep 19, 2019
  
  82d5bfd7
- simplify list · c85b6567
  Laurent Heirendt authored Sep 19, 2019
  
  c85b6567
- change url in deploy script · fda84441
  Laurent Heirendt authored Sep 19, 2019
  
  fda84441
- remove training from january, replace by the one in june · d814b9c3
  Laurent Heirendt authored Sep 19, 2019
  
  d814b9c3
- changes for new theme · ac32a115
  Laurent Heirendt authored Sep 19, 2019
  
  ac32a115