Skip to content

Instantly share code, notes, and snippets.

@yagop
Last active August 29, 2015 14:04
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save yagop/79f330831f0129040376 to your computer and use it in GitHub Desktop.
Save yagop/79f330831f0129040376 to your computer and use it in GitHub Desktop.
Introducción a Git
<!doctype html>
<html>
<head>
<title>Introducción a Git</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<meta name="author" content="Yago Pérez">
<style type="text/css">
@import url(https://fonts.googleapis.com/css?family=Montserrat);
@import url(https://fonts.googleapis.com/css?family=Pacifico);
@import url(https://fonts.googleapis.com/css?family=Ubuntu+Mono:400,700,400italic);
body {
font-family: 'Montserrat';
}
h1, h2, h3 {
font-family: 'Pacifico';
font-weight: 400;
margin-bottom: 0;
}
code {
-moz-border-radius: 5px;
-web-border-radius: 5px;
background: #e7e8e2;
border-radius: 5px;
}
a, a > code {
color: #2979DA;
text-decoration: none;
}
.remark-code, .remark-inline-code {
font-family: 'Ubuntu Mono';
}
.remark-code-line-highlighted {
background-color: rgba(32, 77, 29, 0.5);
}
.orange {
background: none repeat scroll 0% 0% #FFCF8F;
}
.centrado {
width: 75%%;
text-align: center;
}
.footnote {
position: absolute;
bottom: 3em;
}
</style>
</head>
<body>
<textarea id="source">
class: middle, orange
![Git](http://i.imgur.com/JnogCtk.png)
---
class: center, orange
## ¿Qué es Git?
Git es un software de control de versiones.
Desarrollado por Linus Torvalds para el Kernel de Linux.
Al menos las mismas funcionalidades de SVN que ya conocemos.
Gestión distribuida, cada ususario tiene un repositorio local.
Branches, branches everywhere.
---
class: center
![distributed](http://i.imgur.com/bU9prQX.png)
---
class: center, orange
## ¿Qué NO es Git?
GitHub
BitBucket
GUI
Gestión de Infraestructuras Públicas
---
class: center, orange
# Git Workflow
![WorkFlow](http://git-scm.com/images/branching-illustration@2x.png)
---
class: center, orange
![distributed](http://i.imgur.com/sorCgbG.png)
---
Iniciando un repo con origen remoto
```bash
$ git init ./
*$ git remote add origin https://github.com/try-git/try_git.git
$ git pull origin master
$ git status
```
Subiendo cambios al remoto
```bash
$ git add fichero
$ git commit -m "subo nuevo fichero"
*$ git push origin master
```
Las ramas
```bash
*$ git branch clean_up # Crea nueva rama clean_up
$ git checkout clean_up # Se mueve a la rama clean_up
$ git add fichero2
$ git commit -m "Nuevo fichero2"
$ git checkout master # De vuelta a la master
*$ git merge clean_up # Ha juntado las ramas!
$ git branch -d clean_up # Como esa rama no hace falta, la borramos.
$ git push # Se sube al repo remoto
```
---
class: center, orange
## Ramas
![branches](https://www.atlassian.com/git/workflows/pageSections/00/contentFullWidth/0/tabs/02/pageSections/06/contentFullWidth/0/content_files/file0/document/git-workflow-release-cycle-2feature.png)
---
class: center, orange
![BitBucket](http://i.imgur.com/hf1pLQg.png)
Plataforma con interfaz web para alojar repositorios Git y Mercurial.
Repositorios públicos y privados.
JIRA, Project management, Issue tracking y Wiki
Gratis hasta 5 miembros por proyecto.
---
class: center, orange
![GitHub](http://i.imgur.com/f7qKHxA.pngg)
Plataforma con interfaz web para alojar repositorios Git.
Muy bonita, muy cuidada y todo muy hipster.
Git con SSH o HTTPS. También Subversion (SVN) o usar git-svn.
Repositorios públicos y privados (de pago).
Wiki, Task management, Bug tracking y GUI (Mac y Windows).
---
class: center, orange
![github](http://i.imgur.com/OXyzSGM.png)
![soft](http://i.imgur.com/pihNs8V.jpg)
---
class: center, orange
# Eclipse
![eclipse](http://www.eclipse.org/egit/welcome.png)
[www.eclipse.org/egit](http://www.eclipse.org/egit/)
```
Help -> Insall new software -> Collaboration (All Available Sites) -> EGit
```
```
File -> Import -> GIT -> URI
```
---
class: center, orange
# Guías y documentación
[try.github.io](https://try.github.io)
[rogerdudler.github.io/git-guide](http://rogerdudler.github.io/git-guide)
[pcottle.github.io/learnGitBranching](http://pcottle.github.io/learnGitBranching/)
[www.atlassian.com/es/git](https://www.atlassian.com/es/git)
[git-scm.com](http://git-scm.com/)
[wiki.eclipse.org/EGit](http://wiki.eclipse.org/EGit/User_Guide)
---
class: orange
.centrado[
## Markdown
]
```markdown
Markdown
-------------
- Lista
- Sub
[i-Neumaticos](http://www.i-neumaticos.es)
**bold**
~~Mistaken text.~~
*italic*
1. Item 1
2. Item 2
3. Item 3
```
.centrado[
[GitHub markdown](https://guides.github.com/features/mastering-markdown/)
]
---
class: orange, center
## Fin
### Realizada con [Remark](https://github.com/gnab/remark)
### Markdown + Css + Html
### Presentación hospedada en [GitHub Gist](https://gist.github.com/yagop/79f330831f0129040376) *
.footnote[*Usuario [yagop](https://gist.github.com/yagop)]
</textarea>
<script src="https://gnab.github.io/remark/downloads/remark-latest.min.js" type="text/javascript">
</script>
<script type="text/javascript">
var slideshow = remark.create({
highlightLanguage: 'bash',
highlightStyle: 'monokai'
});
</script>
</body>
</html>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment