Loading...git
0 likes416 views
The document provides an introduction and overview of Git. It begins with an introduction of the presenter and then asks poll questions to gauge who is and isn't using source code management systems. It then proceeds to explain what Git is, why it's useful, how to configure and set up a Git repository, how to add and commit changes, create and switch branches, undo changes, and work with remote repositories and resolve conflicts.
![Commit
$ git commit -m 'First commit. Adelante
caminante!'
[master (root-commit) e3e4e54] First
commit. Adelante caminante!
0 files changed, 0 insertions(+), 0
deletions(-)
create mode 100644 README](https://image.slidesharecdn.com/loading-git-110328033515-phpapp01/85/Loading-git-19-320.jpg)
![Deshaciendo cambios
$ echo "Yeeeeeeeha" > README
$ git add .
$ git commit -m 'Upss this is FAIL'
$ git revert HEAD
Finished one revert.
[detached HEAD 19c6cb5] Revert "Upss this
is FAIL"
1 files changed, 1 insertions(+), 1
deletions(-)](https://image.slidesharecdn.com/loading-git-110328033515-phpapp01/85/Loading-git-24-320.jpg)
Ad
More Related Content
What's hot (19)
Viewers also liked (17)
Ad
Similar to Loading...git (20)
Ad
More from Rafael García (7)
Recently uploaded (20)
Loading...git
- 2. whoami Rafa García Web developer Administrador de Sistemas Entusiasta del software libre
- 3. ¡Encuesta rápida! ● ¿Quién NO está usando un SCM?
- 4. ¡Encuesta rápida! ● ¿Quién NO está usando un SCM? ● ¿Subversion?
- 5. ¡Encuesta rápida! ● ¿Quién NO está usando un SCM? ● ¿Subversion? ● ¿CVS? (¿todavía?)
- 6. ¡Encuesta rápida! ● ¿Quién NO está usando un SCM? ● ¿Subversion? ● ¿CVS? (¿todavía?)
- 7. C'est la vie Le Voyage Magnifique es obra de Debra Chow - http://vimeo.com/6846068
- 8. ¿Qué es Git?
- 9. ¿Qué es Git? Git sistema de control de versiones distribuido, open source, diseñado para ser rápido y eficiente.
- 10. ¿Por qué Git? ● Distribuido ● ¡Es muy rápido! ● Branching ● Workflows ● Una gran comunidad detrás
- 11. Configurar Git By Twicepix - http://www.flickr.com/photos/twicepix/4288056667/
- 12. Configurar Git $ git config --global user.name "Rafa G." $ git config --global user.email "[email protected]" # Extraball $ git config --global color.ui auto $ git config --global core.editor /usr/bin/vim
- 13. Crear repositorio $ mkdir foo $ cd foo/ ~/foo$ git init Initialized empty Git repository in ~/foo/.git/
- 15. Estado del repositorio $ git status # On branch master # # Initial commit # nothing to commit (create/copy files and use "git add" to track)
- 16. Estado del repositorio $ touch README $ git status # On branch master # # Initial commit # # Untracked files: # (use "git add <file>..." to include in what will be committed) # # README nothing added to commit but untracked files present (use "git add" to track)
- 17. Stage $ git add README
- 18. Stage $ git add README $ git status # On branch master # # Initial commit # # Changes to be committed: # (use "git rm --cached <file>..." to unstage) # # new file: README #
- 19. Commit $ git commit -m 'First commit. Adelante caminante!' [master (root-commit) e3e4e54] First commit. Adelante caminante! 0 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 README
- 20. Ignorar ficheros $ cat .gitignore .bundle/ db/sphinx/* log/**/* log/* tmp/**/* tmp/* .rvmrc
- 21. Deshaciendo cambios By Gaelx - http://www.flickr.com/photos/gaelx/2664672458/
- 22. Deshaciendo cambios $ echo "Loadin$%&... Git" > README $ git status # On branch master # Changed but not updated: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # # modified: README # no changes added to commit (use "git add" and/or "git commit -a") $ git checkout README $ git status # On branch master nothing to commit (working directory clean)
- 23. Deshaciendo cambios $ echo "A not useful text" > README $ git add . $ git status # On branch master # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # modified: README # $ git reset HEAD README
- 24. Deshaciendo cambios $ echo "Yeeeeeeeha" > README $ git add . $ git commit -m 'Upss this is FAIL' $ git revert HEAD Finished one revert. [detached HEAD 19c6cb5] Revert "Upss this is FAIL" 1 files changed, 1 insertions(+), 1 deletions(-)
- 25. Deshaciendo cambios By Stan Lee
- 26. Deshaciendo cambios $ git reset --hard HEAD^^^ # Que es lo mismo que... $ git reset --hard HEAD~3
- 27. Deshaciendo cambios $ git reset --hard HEAD^^^ # Que es lo mismo que... $ git reset --hard HEAD~3 # O una versión mas light $ git reset --soft HEAD^
- 28. Branch By n8agrin - http://www.flickr.com/photos/n8agrin/2735063012/
- 29. Branch # Creamos la rama $ git branch loading $ git checkout loading Switched to branch 'loading' # Extraball $ git checkout -b loading Switched to a new branch 'loading'
- 30. Branch # Moverse por las ramas $ git branch loading $ git branch riojaparty $ git checkout loading Switched to branch 'loading' $ git checkout riojaparty Switched to branch 'riojaparty' $ git checkout master Switched to branch 'master' # Extraball – Listado de ramas (man git-branch) $ git branch loading * master riojaparty
- 31. Branch # Merge de ramas $ git checkout riojaparty # Commit some changes! $ git checkout master $ git merge riojaparty Updating 6f190b0..a6e1f75 Fast-forward 0 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 riojaparty_talks.txt
- 32. Branch $ git branch remove_me $ git branch -d remove_me Deleted branch remove_me (was a6e1f75). # Extraball # Borrar rama con cambios no "mergeados" (man git-branch) $ git branch -D remove_me
- 33. Tag # Creando tags $ git tag v1.0 $ git tag v1.0 $ git tag beta1 HEAD^ $ git tag beta1 v1.0 $ git tag beta2 HEAD~5 $ git tag beta1 beta2 V1.0 # Borrando tags $ git tag -d beta2 Deleted tag 'beta2' (was f379043)
- 34. Trabajando en equipo By Steve Punter - http://www.flickr.com/photos/spunter/2947192314
- 35. Trabajando en equipo # Clonando un repositorio $ git clone foo foo_clone Initialized empty Git repository in ~/foo_clone/.git/ $ cd foo_clone $ git remote origin $ git remote show origin * remote origin Fetch URL: ~/foo Push URL: ~/foo HEAD branch (remote HEAD is ambiguous, may be one of the following): master riojaparty Remote branches: loading tracked master tracked riojaparty tracked Local branch configured for 'git pull': master merges with remote master Local ref configured for 'git push': master pushes to master (up to date)
- 36. Trabajando en equipo $ git clone --bare foo foo.git Initialized empty Git repository in ~/foo.git/ $ ls foo.git/ branches config description HEAD hooks info objects packed-refs refs
- 37. Trabajando en equipo # Enviando cambios al repositorio remoto $ git clone foo.git foo_bare # Realizamos cambios... $ git push Counting objects: 3, done. Delta compression using up to 8 threads. Compressing objects: 100% (2/2), done. Writing objects: 100% (2/2), 250 bytes, done. Total 2 (delta 1), reused 0 (delta 0) Unpacking objects: 100% (2/2), done. To ~/foo.git c2d55e3..012f07d master -> master
- 38. Trabajando en equipo # Actualizando nuestra copia local... $ git pull remote: Counting objects: 3, done. remote: Compressing objects: 100% (2/2), done. remote: Total 2 (delta 1), reused 0 (delta 0) Unpacking objects: 100% (2/2), done. From ~/foo a6e1f75..83a30a8 master -> origin/master Updating a6e1f75..83a30a8 Fast-forward 0 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 add_another_file.txt
- 39. Trabajando en equipo # Enviando cambios a un repositorio remoto concreto # Hacemos algunos cambios y entonces... $ git push origin master Counting objects: 3, done. Delta compression using up to 8 threads. Compressing objects: 100% (2/2), done. Writing objects: 100% (2/2), 265 bytes, done. Total 2 (delta 1), reused 0 (delta 0) Unpacking objects: 100% (2/2), done. To ../foo.git 012f07d..0a5d1cd master -> master
- 40. Conflictos By NWharry - http://www.flickr.com/photos/nightwing_26/5151831220/
- 41. Extras ● Stash ● Blame ● Bisect ● Ramas y tags remotos ● Workflows ● …
- 42. ¡Gracias! By woodleywonderworks - http://www.flickr.com/photos/wwworks/4759535950/
- 43. Enlaces Git - http://git-scm.com/ Tutoriales y libros: Git Immersion - http://gitimmersion.com/ Pro Git (Scott Chacon) - http://www.humbug.in/docs/pro-git-book-es/ Pragmatic Guide To Git - http://pragprog.com/titles/pg_git/pragmatic-guide-to-git Pensamientos: Joel on Software - http://www.joelonsoftware.com/items/2010/03/17.html Presentaciones: Git 101 - http://www.slideshare.net/chacon/git-101-presentation The everyday developer's guide to version control with Git - http://www.slideshare.net/erincarter/the-everyday-developers-guide-to-version-control-with-git Git - http://www.slideshare.net/jnewland/git-512895 Git Started With Git - http://www.slideshare.net/qrush/git-started-with-git