Commits · 9603bc7d7f67c5827acc8d3cf840683c6497e981 · zedif - Kompetenzzentrum Digitale Forschung / courses / git-intermediate-4h · GitLab

Snippets Groups Projects

May 09, 2022
- Add Summary and Outlook · 9603bc7d
  Eckhard Kadasch authored 3 years ago
  
  9603bc7d
- Correct file name · c2ced1e1
  Eckhard Kadasch authored 3 years ago
  
  c2ced1e1
- Adapt to new git-pull setting · 67390296
  Eckhard Kadasch authored 3 years ago
  
  67390296
- Show branch like it is, nonlinear · b91041e5
  Eckhard Kadasch authored 3 years ago
  
  b91041e5
- Correct GitLab server URL · b5b2b142
  Christian Knüpfer authored 3 years ago
  b5b2b142
- Remove wrongly named file · e8c0dfbd
  Christian Knüpfer authored 3 years ago
  
  e8c0dfbd
- Move subsection "Git basics" to beginning · 306c158e
  Christian Knüpfer authored 3 years ago
  306c158e
- Add `git config` to "Git basics" · 517971a7
  Christian Knüpfer authored 3 years ago
  
  517971a7
- Remove gitconfig file · 5170b0b4
  Christian Knüpfer authored 3 years ago
  5170b0b4
- Exchange sections "Tagging" and "Blaming" · efed1c46
  Christian Knüpfer authored 3 years ago
  
  efed1c46
- Remove explicit target · d84977f4
  Christian Knüpfer authored 3 years ago
  d84977f4
- Merge branch 'main' of git.rz.uni-jena.de:zedif/courses/git-intermediate-4h · aeeb580d
  Eckhard Kadasch authored 3 years ago
  
  aeeb580d
- Add mentions of exercises 2, 3; closes #25 · 1ab61b1a
  Eckhard Kadasch authored 3 years ago
  
  1ab61b1a
- Merge branch 'main' of https://git.rz.uni-jena.de/zedif/courses/git-intermediate-4h · def69901
  Christian Knüpfer authored 3 years ago
  
  def69901
- Add directives for instructors · 2d95eb67
  Christian Knüpfer authored 3 years ago
  
  2d95eb67
- Correct email address · cf2a77b7
  Christian Knüpfer authored 3 years ago
  
  cf2a77b7
- Use `git pull --no-ff` to force three-way merge, closes #24 · 653c4f80
  Eckhard Kadasch authored 3 years ago
  
  653c4f80
- Add Eckhard's opinion to the example repositories · 02244044
  Christian Knüpfer authored 3 years ago
  02244044
- Merge branch 'main' of https://git.rz.uni-jena.de/zedif/courses/git-intermediate-4h · c93e5102
  Christian Knüpfer authored 3 years ago
  
  c93e5102
- Add script for pushing to all example repositories · 07f5359d
  Christian Knüpfer authored 3 years ago
  07f5359d
- Remove mention of `git clone` · 19e756b7
  Eckhard Kadasch authored 3 years ago
  
  19e756b7
- Add "git pull" as first step · def30cda
  Christian Knüpfer authored 3 years ago
  def30cda
- Add landscape option · e7aa3962
  Christian Knüpfer authored 3 years ago
  e7aa3962
- Update schedule · 2bf7170a
  Christian Knüpfer authored 3 years ago
  
  2bf7170a
- Fix fast-forward merge config command · 639e9341
  Eckhard Kadasch authored 3 years ago
  
  639e9341
- Add image for push-pull conflict, add image Makefile · 57be69b9
  Eckhard Kadasch authored 3 years ago
  
  57be69b9
- Adapt exercise to git config pull ff.only setting · 54a47093
  Eckhard Kadasch authored 3 years ago
  
  54a47093
- Remove exercises hierachy · 9db5a29c
  Eckhard Kadasch authored 3 years ago
  
  9db5a29c
- Add pagebreak after titlepage · cfbe052d
  Christian Knüpfer authored 3 years ago
  
  cfbe052d
- Add exercise about branching · e18a9375
  Christian Knüpfer authored 3 years ago
  e18a9375
- Add first draft of schedule · 6660f2e3
  Christian Knüpfer authored 3 years ago
  
  6660f2e3
- Add push.ff=only to setup · 7a22179b
  Christian Knüpfer authored 3 years ago
  7a22179b
May 08, 2022
- Add images *distributed version controll* and *push-pull workflow* · a36a153c
  Eckhard Kadasch authored 3 years ago
  
  a36a153c
- Fix typo, improve formatting · 670e2515
  Eckhard Kadasch authored 3 years ago
  
  670e2515
- Make `pdfs` subdir only if needed · a0fd0744
  Eckhard Kadasch authored 3 years ago
  
  a0fd0744
May 06, 2022
- Require Git 2.23+ in German description, too · 95b96513
  Eckhard Kadasch authored 3 years ago
  
  95b96513
- We use `git switch`, introduced in Git 2.23. · 761d4a2f
  Eckhard Kadasch authored 3 years ago
  
  761d4a2f
- Clarify branch explanation in Git · f86fadbc
  Eckhard Kadasch authored 3 years ago
  
  f86fadbc
- Fix typo · 7eaec050
  Eckhard Kadasch authored 3 years ago
  
  7eaec050
- Add merge-conflict exercise, closes #10 · 4a411149
  Eckhard Kadasch authored 3 years ago
  
  4a411149