GIT Workshop 2014: Unterschied zwischen den Versionen
Die Seite wurde neu angelegt: „{{Veranstaltung |name=GIT Workshop 2014 |image=No-Logo.png |involved=metachris |when=27.05.2014, 19:00 |category=Workshop |costs=0 |status=p…“ |
KKeine Bearbeitungszusammenfassung |
||
| (60 dazwischenliegende Versionen von 22 Benutzern werden nicht angezeigt) | |||
| Zeile 1: | Zeile 1: | ||
{{Veranstaltung | {{Veranstaltung | ||
|name=GIT Workshop 2014 | |name=GIT Workshop 2014 | ||
|image= | |image=Git_Logo.png | ||
|involved=[[User:metachris|metachris]] | |involved=[[User:metachris|metachris]] | ||
|when=27.05.2014, 19:00 | |when=27.05.2014, 19:00 | ||
|category=Workshop | |category=Workshop | ||
|costs=0 | |costs=0 | ||
| | |wtf=<-- | ||
| | |status=active | ||
|hidden=false | |hidden=false | ||
}} | }} | ||
Hands-On [http://en.wikipedia.org/wiki/Git_(software) 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 | |||
* Part 1: http://piratepad.net/3FVj2Ni4MQ | |||
* Part 2 (3.6.2014): http://piratepad.net/M1NbVXVT72 | |||
'''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 [https://code.google.com/p/gerrit/ Gerrit], integrating [http://jenkins-ci.org/ Jenkins CI] | |||
* Automatic code-style checks at <code>git commit</code> | |||
* 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. | |||
* Session 1: <strike>'Tue, 27.5.2014 (19:00)</strike> | |||
* Session 2 (Team Workflows): '''Tue, 10.6.2014 (19:00)''' | |||
* Beginner Intro Session: Tue, 3.6.2014 (19:00) | |||
= Prerequisites = | |||
* You are somewhat familiar with the terminal/command line | |||
* You have <code>git-core</code> installed (can run <code>git</code> in the command line) | |||
* You added yourself to the participants (further down) | |||
* You have an account at [http://www.github.com 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). | |||
# Fork or clone the [https://github.com/metachris/metalab-git-workshop workshop repository] and make a change (change literally anything). See also the Github [https://guides.github.com/ Guides] and [https://help.github.com/categories/54/articles Bootcamp] | |||
# Send me a [https://help.github.com/articles/using-pull-requests pull-request] or a [http://stackoverflow.com/questions/2082296/how-do-patches-work-in-git 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 **(all seats for this evening are now allocated)** | |||
* Part 2: Tue, 10.6.2014, 19:00, Hauptraum | |||
* Part 3: Tue, 24.6.2014, 19:00, Hauptraum | |||
Beginner intro session: Tuesday, 3.6.2014, 19:00, Library | |||
= Participants = | |||
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. | |||
# [[User:zerocity|zerocity]] | |||
# [[User:wizard23|wizard23]] | |||
# [[User:stereotype|stereotype]] | |||
# [[User:cygenb0ck|cygenb0ck]] | |||
# [[User:luto|luto]] | |||
# derLukers | |||
# Maria | |||
# [[User:reox|reox]] | |||
# [[User:pl|pl]] | |||
# [[User:VT100|VT100]] | |||
# [[User:overflo|overflo]] | |||
# Pavel | |||
# jaeh | |||
# Dajana | |||
# [[User:Queltos|queltos]] | |||
# [[User:gem|Gem]] | |||
# [[User:leyrer|Leyrer]] | |||
# [[User:berq|berq]] | |||
# 0x746f6d | |||
# [[User:m68k|m68k]] | |||
# [[User:jain7th|jain7th]] | |||
# [[User:kay|kay]] | |||
# [[User:Pete|Hetti]] | |||
# [[User:qubit23|qubit23]] | |||
# [[User:scriptythekid|scripty]] | |||
# [[User:pwnicorn|Ben]] | |||
# [[User:Ktsouk|Ktsouk]] | |||
= Various = | |||
<pre># 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'</pre> | |||
= Resources = | |||
Just a collection of links for the curious, not required reading :) | |||
* Branching / Deployment models: [http://scottchacon.com/2011/08/31/github-flow.html Github Flow], [http://nvie.com/posts/a-successful-git-branching-model 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 | |||