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
KKeine Bearbeitungszusammenfassung
KKeine Bearbeitungszusammenfassung
 
(54 dazwischenliegende Versionen von 22 Benutzern werden nicht angezeigt)
Zeile 1: Zeile 1:
{{Veranstaltung
{{Veranstaltung
|name=GIT Workshop 2014
|name=GIT Workshop 2014
|image=No-Logo.png
|image=Git_Logo.png
|involved=[[User:metachris|metachris]]
|involved=[[User:metachris|metachris]]
|when=27.05.2014, 19:00
|when=27.05.2014, 19:00
Zeile 14: Zeile 14:


https://github.com/metachris/metalab-git-workshop
https://github.com/metachris/metalab-git-workshop
* Part 1: http://piratepad.net/3FVj2Ni4MQ
* Part 2 (3.6.2014): http://piratepad.net/M1NbVXVT72




Zeile 23: Zeile 26:
* Contributing to open source projects
* Contributing to open source projects
* Workflows for teams and dev->testing->production environments
* Workflows for teams and dev->testing->production environments
* Stashing, Sqashing, Rebasing, Submodules
'''More Topic Ideas'''
* Issue tracking
* Issue tracking
* Stashing, Sqashing, Rebasing, Submodules
* Code reviews with [https://code.google.com/p/gerrit/ Gerrit], integrating [http://jenkins-ci.org/ Jenkins CI]
* Code reviews with GIT, Jenkins CI
* Automatic code-style checks at <code>git commit</code>
* Automatic code-style checks at <code>git commit</code>
* Using blame accross merged branches
* < YOUR TOPIC IDEA >
* < YOUR TOPIC IDEA >




It's a command-line oriented workshop where all hands will get dirty. We celebrate failure and it's going to be 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 on '''Tue, 27.5.2014 (19:00)''' and see how and where we progress; primarily based on your interests, experiences and current projects/needs.
* 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 47: Zeile 56:
== Task 1 ==
== Task 1 ==


A quick and easy 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).




# Clone or fork the [https://github.com/metachris/metalab-git-workshop workshop repository] and make a change (change literally anything). See also the [https://help.github.com/categories/54/articles Github Bootcamp]
# 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 [http://stackoverflow.com/questions/2082296/how-do-patches-work-in-git patch] or [https://help.github.com/articles/using-pull-requests pull-request], either on Github or to chris [at] linuxuser.at
# 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. Thanks for your contribution to an open source project.
+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 =  
= 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 =
= 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 =
= Various =
Zeile 88: Zeile 124:
alias gh='git log --pretty=format:"%h %ad | %s%d [%an]" --graph --date=short'</pre>
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
* 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

Aktuelle Version vom 10. Juni 2014, 00:17 Uhr

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


  • Session 1: 'Tue, 27.5.2014 (19:00)
  • 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 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 **(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.

  1. zerocity
  2. wizard23
  3. stereotype
  4. cygenb0ck
  5. luto
  6. derLukers
  7. Maria
  8. reox
  9. pl
  10. VT100
  11. overflo
  12. Pavel
  13. jaeh
  14. Dajana
  15. queltos
  16. Gem
  17. Leyrer
  18. berq
  19. 0x746f6d
  20. m68k
  21. jain7th
  22. kay
  23. Hetti
  24. qubit23
  25. scripty
  26. Ben
  27. Ktsouk

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


Abgerufen von „https://metalab.at/alpakaparty/index.php?title=GIT_Workshop_2014&oldid=54130“