GIT Workshop 2014: Unterschied zwischen den Versionen

aus Metalab, dem offenen Zentrum für meta-disziplinäre Magier und technisch-kreative Enthusiasten.
Wechseln zu: Navigation, Suche
K
K (resources)
Zeile 30: Zeile 30:
  
  
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.
  
  
Zeile 50: Zeile 50:
  
  
# 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]
+
# Clone or fork 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 [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
  
Zeile 88: Zeile 88:
 
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

Version vom 13. Mai 2014, 09:37 Uhr

GIT Workshop 2014
No-Logo.png

wann:

27.05.2014, 19:00

Involvierte:

metachris

Rubrik:

Workshop

Kostenbeitrag:

0

Status:

active

Beschreibung:

<--

Zuletzt aktualisiert: 13.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
  • Issue tracking
  • Stashing, Sqashing, Rebasing, Submodules
  • Code reviews with GIT, Jenkins CI
  • Automatic code-style checks at git commit
  • < 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. Clone or fork the workshop repository and make a change (change literally anything). See also the Github Guides and Bootcamp
  2. Send me a patch or pull-request, either on Github or to chris [at] linuxuser.at


+1. Thanks for your contribution to an open source project.


When / Where

  • Tue, 27.5.2014, 19:00, Hauptraum


Participants

Please add yourself to the list of participants.


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