GIT Workshop 2014: Unterschied zwischen den Versionen

aus Metalab, dem offenen Zentrum für meta-disziplinäre Magier und technisch-kreative Enthusiasten.
Wechseln zu: Navigation, Suche
K (task 1 infos)
Zeile 82: Zeile 82:
# [[User:cygenb0ck|cygenb0ck]]
# [[User:cygenb0ck|cygenb0ck]]
# [[User:luto|luto]] (+2) {{Yes}}
# [[User:luto|luto]] (+2) {{Yes}}
# [[User:luto|luto +1 #1]]
# [[User:luto|luto +1 #2]]
# [[User:reox|reox]] {{Yes}}
# [[User:reox|reox]] {{Yes}}
# [[User:pl|pl]]
# [[User:pl|pl]]
Zeile 96: Zeile 98:
# [[User:berq|berq]] {{Yes}}
# [[User:berq|berq]] {{Yes}}
# 0x746f6d {{Yes}}
# 0x746f6d {{Yes}}
= Various =
= Various =

Version vom 24. Mai 2014, 11:42 Uhr

GIT Workshop 2014
Git Logo.png
27.05.2014, 19:00
Zuletzt aktualisiert: 24.05.2014

Hands-On GIT Workshop in two or more parts which will make your life easy and may save your ass.

General Topics

  • Commiting, Diffing, Reverting, Tags
  • Branches, Merging and Conflicts
  • Remotes, Github, Forking, Pull-Requests
  • Working together within a repository and across repos
  • Contributing to open source projects
  • Workflows for teams and dev->testing->production environments
  • Stashing, Sqashing, Rebasing, Submodules

More Topic Ideas

  • Issue tracking
  • Code reviews with Gerrit, integrating Jenkins CI
  • Automatic code-style checks at git commit
  • Using blame accross merged branches

It's a command-line oriented workshop where all hands will get dirty! We celebrate failure and are going to have fun.

Every skill level from is welcome! We'll start on Tue, 27.5.2014 (19:00) and see how and where we progress; primarily based on your interests, experiences and current projects/needs.


  • You are somewhat familiar with the terminal/command line
  • You have git-core installed (can run git in the command line)
  • You added yourself to the participants (further down)
  • You have an account at Github
  • You tried task 1

Task 1

A quick and easy task to get you started! It's only about attempting! If you run into problems, it still counts as an attempt (just send me a message).

  1. Fork or clone the workshop repository and make a change (change literally anything). See also the Github Guides and Bootcamp
  2. Send me a pull-request or a patch, either on Github or to chris [at]

+1 for your contribution!

Protip for the super lazy: you can fork the repo, edit a file, and submit a pull request all without leaving the Github website. [try the command line first :)]

When / Where

  • Part 1: Tue, 27.5.2014, 19:00, Hauptraum
  • Part 2: tbd
  • ...


Add yourself if you are interested.

Attempt task 1 to get a green check. If you don't have a wiki account, just send me a pull request and i'll add you.

  1. zerocity
  2. wizard23
  3. stereotype
  4. cygenb0ck
  5. luto (+2)
  6. luto +1 #1
  7. luto +1 #2
  8. reox
  9. pl
  10. VT100
  11. overflo
  12. Pavel
  13. jaeh
  14. Dajana
  15. PK
  16. queltos
  17. Gem
  18. Bernd
  19. Leyrer
  20. berq
  21. 0x746f6d


# Possibly useful Git aliases for your ~/.bashrc or ~/.bash_profile
alias g='git'
alias gs='git status | more'
alias ga='git add '
alias gb='git branch '
alias gc='git commit'
alias gcnv="git commit --no-verify"
alias gd='git diff'
alias go='git checkout '
alias gl='git log'
alias gh='git log --pretty=format:"%h %ad | %s%d [%an]" --graph --date=short'


Just a collection of links for the curious, not required reading :)