@soyguijarro

Ramón Guijarro

Desarrollador web creativo con interés por el diseño, la comunicación y los datos. Entusiasta de JavaScript y React. Orgulloso participante de h4ckademy.

Antes de empezar

Motivación

Conceptos

Configuración

Uso básico

Uso en equipo

Consejos finales

Próximos pasos

Motivación

Problema

Informe.docx

Informe 2.docx

Informe - cambios.docx

Informe (nuevo).docx

Informe FINAL.docx

Informe FINAL definitivo.docx

Informe FINAL definitivo 2.docx

Informe FINAL FINAL DEFINITIVO PALABRITA.docx

Solución

“

”

https://git-scm.com

Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency. 

“

”

https://git-scm.com

Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency. 

“

”

https://git-scm.com

Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency. 

“

”

https://git-scm.com

Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency. 

Conceptos

Local y remoto

≠

…

Áreas de trabajo

Untracked

Tracked

Estado de un fichero

Staged

Commited

Ficheros

Staging

Commit

Trabajando

Preparado

Guardado

Configuración

sudo apt-get install git-all

git config --global user.name "Alicia"

git config --global user.email alicia@maravillas.com

Uso básico

Crear repositorio

git init

git clone

Ver estado

git status

git log

git diff

Guardar cambios

git add

git commit

https://xkcd.com/1296/

Uso en equipo

Interactuar con remoto

git push

git pull

Resolver conflictos

git merge

git rebase

git reset

Próximos pasos

Ramas

Pull requests

Etiquetas

Stashing

Ramas

Pull requests

Etiquetas

Stashing

Ramas

Pull requests

Etiquetas

Stashing

Ramas

Pull requests

Etiquetas

Stashing

Consejos finales

https://git-scm.com/book

http://gitcheatsheet.soyguijarro.com

https://chris.beams.io/posts/git-commit