Skip to content

Instantly share code, notes, and snippets.

@raphaelLacerda

raphaelLacerda/git-artigos.md

Created June 17, 2016 00:53
Show Gist options
  • Star 6 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save raphaelLacerda/687db0162a610f63d13ae899ec680518 to your computer and use it in GitHub Desktop.
Save raphaelLacerda/687db0162a610f63d13ae899ec680518 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
git-artigos.md

#Apresentação GIT

#####Git basics

  1. Entendendo a nomenclatura
  2. Conhecendo os comandos
  3. Melhorando seu terminal

#####Branches

  1. Como lidar
  2. Listando branches remotas
  3. Criando e excluindo branches remotas

#####Merging

  1. Como fazer os merges?

  2. Qual diferença entre merge e rebase?

  3. Não faça rebase de public branches

    • Now, to the question of whether merging or rebasing is better: hopefully you’ll see that it’s not that simple. Git is a powerful tool, and allows you to do many things to and with your history, but every team and every project is different. Now that you know how both of these things work, it’s up to you to decide which one is best for your particular situation.

    • In general the way to get the best of both worlds is to rebase local changes you’ve made but haven’t shared yet before you push them in order to clean up your story, but never rebase anything you’ve pushed somewhere.

#####Revertendo perdas

  1. Evitando perder trabalhos
  2. Mudando mensagens de commit
  3. Descobrindo o culpado

#####GIT Flow

  1. Você conhece o git flow?
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment