Upgrade to Pro — share decks privately, control downloads, hide ads and more …

WP Meetup Frankfurt – Einstieg in git

WP Meetup Frankfurt – Einstieg in git

Avatar for Benjamin Ackermann

Benjamin Ackermann

January 09, 2018
Tweet

Other Decks in Programming

Transcript

  1. SINNVOLLE KONFIGURATION SINNVOLLE KONFIGURATION git config color.ui true git config

    format.pretty oneline git config --global alias.lg "log --color --graph --pretty=format:'% --abbrev-commit" (Nur einmalig pro Rechner notwendig)
  2. GIT WORKFLOW - DREI STADIEN GIT WORKFLOW - DREI STADIEN

    (Bild: https://rogerdudler.github.io/git-guide/index.de.html)
  3. ADD & COMMIT ADD & COMMIT git add git add

    * git add . git commit -m "Commit-Nachricht"
  4. BRANCHING BRANCHING git checkout -b feature_x git checkout master git

    branch -d feature_x git push origin < branch >
  5. UPDATE & MERGE UPDATE & MERGE git pull git merge

    < branch > git add < dateiname > git diff < quell_branch > < ziel_branch >