Commits · 0d64d35a0bd4cebcc7de9ff35996493095395a7c · R3 / school / courses

Oct 07, 2019
- Merge branch 'advancedtraining-siu' into 'develop' · 0d64d35a
  Laurent Heirendt authored 5 years ago
  
  Draft of slides for advanced training (SIU) See merge request !52
  0d64d35a
- add slide for gitignore · 608f70dd
  Laurent Heirendt authored 5 years ago
  
  608f70dd
- minor formatting change · e021ec2d
  Laurent Heirendt authored 5 years ago
  
  e021ec2d
- remove configuration slides · 5bb44195
  Laurent Heirendt authored 5 years ago
  
  5bb44195
- changes in date · 2a603a65
  Laurent Heirendt authored 5 years ago
  
  2a603a65
- content from previous advanced training · 23d3369d
  Laurent Heirendt authored 5 years ago
  
  23d3369d
- empty framework for advanced training · 593d7ac4
  Laurent Heirendt authored 5 years ago
  
  593d7ac4
Oct 04, 2019
- Merge branch 'minor-typo' into 'develop' · 8c5f39b9
  Laurent Heirendt authored 5 years ago
  
  fix typo See merge request !53
  8c5f39b9
- fix typo · 2d22125a
  Laurent Heirendt authored 5 years ago
  
  2d22125a
Oct 03, 2019
- Merge branch 'fixes' into 'develop' · 9cb81fab
  Laurent Heirendt authored 5 years ago
  
  Fixes after review of SIU presentation See merge request !51
  9cb81fab
- change command to rename folder · 2334c9ed
  Laurent Heirendt authored 5 years ago
  
  2334c9ed
- fix difference of vcs · 5c50ebed
  Laurent Heirendt authored 5 years ago
  
  5c50ebed
Oct 02, 2019
- Merge branch '2019-10-03_siu-basic-course' into 'develop' · 2c2bb45c
  Laurent Heirendt authored 5 years ago
  
  minor formatting changes to siu basic git training See merge request !49
  2c2bb45c
- minor formatting changes · ad4b894b
  Laurent Heirendt authored 5 years ago
  
  ad4b894b
- Merge branch '2019-10-03_siu-basic-course' into 'develop' · 0217f4da
  Laurent Heirendt authored 5 years ago
  
  Basic git course for SIU See merge request !48
  0217f4da
- add symlink to imgs · e50d2dbd
  Laurent Heirendt authored 5 years ago
  
  e50d2dbd
- second round of revisions · 6b3823c3
  Laurent Heirendt authored 5 years ago
  
  6b3823c3
- first round of cleanup · af28f383
  Laurent Heirendt authored 5 years ago
  
  af28f383
- add slides from basic training to siu training · c9f0b052
  Laurent Heirendt authored 5 years ago
  
  c9f0b052
Sep 24, 2019
- Merge branch 'advanced-training' into 'develop' · 0f9b330e
  Laurent Heirendt authored 5 years ago
  
  minor changes for advanced training See merge request R3/school/courses!46
  0f9b330e
- minor changes · 7dc7f6ee
  Laurent Heirendt authored 5 years ago
  
  7dc7f6ee
- Merge branch 'advanced-training' into 'develop' · 54fa54bb
  Laurent Heirendt authored 5 years ago
  
  review of advanced training slides See merge request !45
  54fa54bb
- 2nd round · 4e5353e7
  Laurent Heirendt authored 5 years ago
  
  4e5353e7
- 1st round of review · ef141452
  Laurent Heirendt authored 5 years ago
  
  ef141452
Sep 23, 2019
- Merge branch 'advanced-training' into 'develop' · 8b563ae0
  Laurent Heirendt authored 5 years ago
  
  Advanced training slides See merge request !44
  8b563ae0
- changes in config of kdiff3 · 2ef04024
  Laurent Heirendt authored 5 years ago
  
  2ef04024
- add example for cherry-picking a conflict · 016c2753
  Laurent Heirendt authored 5 years ago
  
  016c2753
- installation instructions for kdiff3, and example for solving conflict on local merge · 94a4f27b
  Laurent Heirendt authored 5 years ago
  
  94a4f27b
- redo merge slide · 82911dea
  Laurent Heirendt authored 5 years ago
  
  82911dea
- overall changes to fit partial cherry-picking and note on common commands · 31c46285
  Laurent Heirendt authored 5 years ago
  
  31c46285
- adapt the slides for cherr-picking · 75163cf0
  Laurent Heirendt authored 5 years ago
  
  75163cf0
- example 2 of rebase · c3ce4d6a
  Laurent Heirendt authored 5 years ago
  
  c3ce4d6a
- fix slides of rebase · dbdef34d
  Laurent Heirendt authored 5 years ago
  
  dbdef34d
- new images for rebase · 46164b0c
  Laurent Heirendt authored 5 years ago
  
  46164b0c
- slide for reverting a commit · 5639f48a
  Laurent Heirendt authored 5 years ago
  
  5639f48a
- change order of slides · e90b37ac
  Laurent Heirendt authored 5 years ago
  
  e90b37ac
- adaptations to reset · 69226386
  Laurent Heirendt authored 5 years ago
  
  69226386
- minor changes in titles for amend · b25fcf3e
  Laurent Heirendt authored 5 years ago
  
  b25fcf3e
Sep 20, 2019
- change overview list · 7b7a63c7
  Laurent Heirendt authored 5 years ago
  
  7b7a63c7
- change title · cc35c558
  Laurent Heirendt authored 5 years ago
  
  cc35c558