GIT Workshop 2014: Unterschied zwischen den Versionen

← Zum vorherigen Versionsunterschied

VisuellWikitext

@@ Zeile 1: / Zeile 1: @@
 {{Veranstaltung
 |name=GIT Workshop 2014
-|image=No-Logo.png
+|image=Git_Logo.png
 |involved=[[User:metachris|metachris]]
 |when=27.05.2014, 19:00
 |category=Workshop
 |costs=0
-|status=planning
+|wtf=<--
-|wtf=so much stuff is happening! it will be a great party! everbody come!
+|status=active
 |hidden=false
 }}
-Hands-On [http://en.wikipedia.org/wiki/Git_(software) GIT]  Workshop in two or more parts.
+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
@@ Zeile 24: / Zeile 27: @@
 * Workflows for teams and dev->testing->production environments
 * Stashing, Sqashing, Rebasing, Submodules
-* Code reviews with GIT, Jenkins CI
+'''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 going be a command-line oriented hands-on workshop where all hands get dirty! We celebrate failure and its going to be a lot of fun! :)
+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 with the basics on '''Tue, 27.5.2014 (19:00)''' and see how and where we progress; primarily based on your interests, experiences and current projects/needs.
-Advanced users are invited to join us on the first evening; for a quick refresher but also for more points-of-view, ideas and people who can answer questions in general!
+* 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)
@@ Zeile 41: / Zeile 48: @@
 * You are somewhat familiar with the terminal/command line
-* <code>git-core</code> installed (you can run <code>git</code> in the command line)
+* You have <code>git-core</code> installed (can run <code>git</code> in the command line)
-* Added yourself to the participants (further down)
+* You added yourself to the participants (further down)
+* You have an account at [http://www.github.com Github]
 * You tried ''task 1''
@@ Zeile 48: / Zeile 56: @@
 == Task 1 ==
-A quick, easy and powerful task to get you started:
+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
-# Clone or fork the [https://github.com/metachris/metalab-git-workshop workshop Github repo] and make a change!
-# Send me a pull-request or a patch, either on Github or to chris [at] linuxuser.at
++1 for your contribution!
-+1 You just made a contribution to an open source project!
+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 =
-* Tue, 27.5.2014, 19:00, Hauptraum
+* 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 =
-Please add yourself to the list of 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:metachris|metachris]]
-* [[User:zerocity|zerocity]]
-* [[User:wizard23|wizard23]]
-* [[User:stereotype|stereotype]]
-* [[User:cygenb0ck|cygenb0ck]]
-* [[User: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># Git aliases for your ~/.bashrc or ~/.bash_profile
+<pre># Possibly useful Git aliases for your ~/.bashrc or ~/.bash_profile
 alias g='git'
 alias gs='git status | more'
@@ Zeile 89: / Zeile 124: @@
 alias gh='git log --pretty=format:"%h %ad | %s%d [%an]" --graph --date=short'</pre>
-* Git-Flow: http://nvie.com/posts/a-successful-git-branching-model (I like the general idea but personally don't use the git-flow tools)
+= 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