GIT Workshop 2014

GIT Workshop 2014
27.05.2014, 19:00
metachris
Workshop
0
active
<--
Zuletzt aktualisiert:	20.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:

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 to an open source project!

When / Where

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

Participants

Please add yourself to the list of participants.

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

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 :)

• Branching / Deployment models: Github Flow, Git-Flow
• Semantic Versioning: http://semver.org
• https://guides.github.com/
• https://help.github.com/articles/what-are-other-good-resources-for-learning-git-and-github
• http://gitimmersion.com/ [guide]
• http://rogerdudler.github.io/git-guide/ [guide]
• http://git-scm.com/book