Commits · 2ef0402445e970fb729e0d596eb93dbf487b705d · R3 / school / courses · GitLab

Snippets Groups Projects

Gitlab will go in to maintenance on Friday 5:30pm since SIU is doing Isilon maintenance and we use isilon shares on the Gitlab

Sep 23, 2019
- changes in config of kdiff3 · 2ef04024
  Laurent Heirendt authored 5 years ago
  
  Verified
  
  2ef04024
- add example for cherry-picking a conflict · 016c2753
  Laurent Heirendt authored 5 years ago
  
  Verified
  
  016c2753
- installation instructions for kdiff3, and example for solving conflict on local merge · 94a4f27b
  Laurent Heirendt authored 5 years ago
  
  Verified
  
  94a4f27b
- redo merge slide · 82911dea
  Laurent Heirendt authored 5 years ago
  
  Verified
  
  82911dea
- overall changes to fit partial cherry-picking and note on common commands · 31c46285
  Laurent Heirendt authored 5 years ago
  
  Verified
  
  31c46285
- adapt the slides for cherr-picking · 75163cf0
  Laurent Heirendt authored 5 years ago
  
  Verified
  
  75163cf0
- example 2 of rebase · c3ce4d6a
  Laurent Heirendt authored 5 years ago
  
  Verified
  
  c3ce4d6a
- fix slides of rebase · dbdef34d
  Laurent Heirendt authored 5 years ago
  
  Verified
  
  dbdef34d
- new images for rebase · 46164b0c
  Laurent Heirendt authored 5 years ago
  
  Verified
  
  46164b0c
- slide for reverting a commit · 5639f48a
  Laurent Heirendt authored 5 years ago
  
  Verified
  
  5639f48a
- change order of slides · e90b37ac
  Laurent Heirendt authored 5 years ago
  
  Verified
  
  e90b37ac
- adaptations to reset · 69226386
  Laurent Heirendt authored 5 years ago
  
  Verified
  
  69226386
- minor changes in titles for amend · b25fcf3e
  Laurent Heirendt authored 5 years ago
  
  Verified
  
  b25fcf3e
Sep 20, 2019
- change overview list · 7b7a63c7
  Laurent Heirendt authored 5 years ago
  
  Verified
  
  7b7a63c7
- change title · cc35c558
  Laurent Heirendt authored 5 years ago
  
  Verified
  
  cc35c558
- change order of slides · 2d01fa00
  Laurent Heirendt authored 5 years ago
  
  Verified
  
  2d01fa00
- changes in getting started section · d788b33d
  Laurent Heirendt authored 5 years ago
  
  Verified
  
  d788b33d
- changes in amend section · a33e1206
  Laurent Heirendt authored 5 years ago
  
  Verified
  
  a33e1206
- change of instructions for getting started · 62221bfd
  Laurent Heirendt authored 5 years ago
  
  Verified
  
  62221bfd
Sep 19, 2019
- Merge branch 'advanced-slides' into 'develop' · 123da439
  Laurent Heirendt authored 5 years ago
  
  Preliminary slides for advanced git training See merge request !42
  123da439
- update theme submodule · 0b429241
  Laurent Heirendt authored 5 years ago
  
  Verified
  
  0b429241
- changes names of files in list · 09b884b6
  Laurent Heirendt authored 5 years ago
  
  Verified
  
  09b884b6
- renaming files · 70a9c286
  Laurent Heirendt authored 5 years ago
  
  Verified
  
  70a9c286
- merge intro and presentation slides · bf04f7f8
  Laurent Heirendt authored 5 years ago
  
  Verified
  
  bf04f7f8
- combining slides · 67625ca0
  Laurent Heirendt authored 5 years ago
  
  Verified
  
  67625ca0
- simplifications · 17b70034
  Laurent Heirendt authored 5 years ago
  
  Verified
  
  17b70034
- simplifications of slides · a86258b8
  Laurent Heirendt authored 5 years ago
  
  Verified
  
  a86258b8
- simplifications of slides · cdba2c73
  Laurent Heirendt authored 5 years ago
  
  Verified
  
  cdba2c73
- change index and overview+ · 82d5bfd7
  Laurent Heirendt authored 5 years ago
  
  Verified
  
  82d5bfd7
- simplify list · c85b6567
  Laurent Heirendt authored 5 years ago
  
  Verified
  
  c85b6567
- change url in deploy script · fda84441
  Laurent Heirendt authored 5 years ago
  
  Verified
  
  fda84441
- remove training from january, replace by the one in june · d814b9c3
  Laurent Heirendt authored 5 years ago
  
  Verified
  
  d814b9c3
- changes for new theme · ac32a115
  Laurent Heirendt authored 5 years ago
  
  Verified
  
  ac32a115
- change of location of imgs · 17e8130b
  Laurent Heirendt authored 5 years ago
  
  Verified
  
  17e8130b
- rename git training slides · cf78d7b9
  Laurent Heirendt authored 5 years ago
  
  Verified
  
  cf78d7b9
- move git training slides into place · a0e60ce0
  Laurent Heirendt authored 5 years ago
  
  Verified
  
  a0e60ce0
- moving git slides from january to new structure · eec91320
  Laurent Heirendt authored 5 years ago
  
  eec91320
- Merge remote-tracking branch 'gitcourse/new-structure' into git-slides · e355339d
  Laurent Heirendt authored 5 years ago
  
  e355339d
- moving slides into folder · 0d7b6a81
  Laurent Heirendt authored 5 years ago
  
  0d7b6a81
Sep 12, 2019
- Merge branch '2019-08-21_testCourse' into 'develop' · 53f15bad
  Laurent Heirendt authored 5 years ago
  
  2019 08 21 test course See merge request R3-core/outreach/presentations-internal!41
  53f15bad