GIT Workshop 2014: Unterschied zwischen den Versionen

aus Metalab Wiki, dem offenen Zentrum für meta-disziplinäre Magier und technisch-kreative Enthusiasten.
Zur Navigation springenZur Suche springen
K (→‎Participants: kay added kay)
Zeile 102: Zeile 102:
# [[User:jain7th|jain7th]]
# [[User:jain7th|jain7th]]
# [[User:kay|kay]]
# [[User:kay|kay]]
# [[User:Hetti|Pete]]


= Various =
= Various =

Version vom 25. Mai 2014, 14:28 Uhr

GIT Workshop 2014
Git Logo.png
27.05.2014, 19:00
metachris
Workshop
0
active
<--
Zuletzt aktualisiert: 25.05.2014


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

https://github.com/metachris/metalab-git-workshop


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
  • < YOUR TOPIC IDEA >


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.


Prerequisites

  • 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] linuxuser.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
  • ...


Participants

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 (+3)
  6. luto +1 #1, derLukers
  7. luto +1 #2
  8. luto +1 #3
  9. reox
  10. pl
  11. VT100
  12. overflo
  13. Pavel
  14. jaeh
  15. Dajana
  16. PK
  17. queltos
  18. Gem
  19. Bernd
  20. Leyrer
  21. berq
  22. 0x746f6d
  23. m68k
  24. jain7th
  25. kay
  26. Pete

Various

# 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'


Resources

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