Home

a git workshop

Was wünscht sich Roya von euch zu Weihnachten?

• Schokolade
• noch mehr Schokolade
• HAUPTSACHE SCHOOOOKI

what is git?

Simple: GIT means:

igitti-git

git is

• a version/revision control system

• distributed

• network-independent

• serverless

• fast

• working with a graph of commits representing flows of directory tree changes

• using hash values to identify nodes (commits)

• incepted by Linus Torvalds to manage Linux kernel development

understanding that graph is key to understand git

A successful Git branching model:

basic workflow

Simplified git data flow:

Now use your github account to fork this repo or become a collaborator and do git clone [email protected]:jaetzold/git-workshop.git.

other stuff

• master and origin
  • are just conventions and do not have anything special.
• branches vs. tags
• .gitignore
• index / the staging area
• remotes
• stash
• pull vs. fetch/merge
• status, log, ...
  • git log --name-status
  • git log --stat
  • git branch -vva
• rebase, sqash, ...
  • git rebase -i HEAD~2
• bare repository
  • create: git clone --bare <url/path to repo> <bare-repo-name>.git.
  • Essentially a git repo without a working copy (and the core.bare config option set to true).
  • everything is below a single .git directory
• (global) preferences
• GUI clients
  • SourceTree, smartgit, & many more.
  • "builtin": git-gui & gitk

dazwischen...?

bla

documentation

• git SCM Wiki
• http://git-scm.com/doc
• interactive online course

further topics

• hooks
• submodules (git-workshop$ git submodule add [email protected]:jaetzold/git-workshop.wiki.git wiki)
• server installation options (ha!)
  • gitolite
• adaptors to other SCM systems
  • git-svn

Kristians Section

• Zeile1
• Zeile2

what the hell ist an .md-file ..?

• .md is just a text file written in Markdown syntax. (see http://daringfireball.net/projects/markdown/).

  Marc was here!! Lars war jetzt auch hier...!!!

keine Änderunge mehr..?