├── .gitignore ├── .travis.yml ├── LICENSE ├── README.md ├── aprendegit.css ├── conflicto ├── metadata.xml ├── texto ├── Modulos.md ├── aprendegit.txt ├── ganchos.md ├── github.md ├── img │ ├── blame.png │ ├── by-sa.png │ ├── conflicto.png │ ├── diff-index.png │ ├── diff-tree-2.png │ ├── diff-tree-3.png │ ├── fusion.png │ ├── github-blame.png │ ├── githubform.png │ ├── gitk.png │ ├── instaweb-1.png │ ├── instaweb-2.png │ ├── ls-tree.png │ ├── masconflicto.png │ ├── otroconflicto.png │ ├── post-rebase.png │ ├── pre-rebase.png │ ├── rebase-y-commit.png │ ├── tag.png │ ├── tree-git.png │ ├── wingit1.png │ ├── wingit10.png │ ├── wingit2.png │ ├── wingit3.png │ ├── wingit4.png │ ├── wingit5.png │ ├── wingit6.png │ ├── wingit7.png │ ├── wingit8.png │ └── wingit9.png ├── include.css ├── introduccion.md ├── mas_usos.md ├── prologo.md ├── solucion_problemas.md ├── uso_basico.md └── words.dic └── utils ├── md2docx ├── md2epub ├── md2html ├── md2pdf ├── md2pdf-kdp ├── plantilla-kdp.latex ├── plantilla.latex ├── urls-with-short.json └── urls.json /.gitignore: -------------------------------------------------------------------------------- 1 | *.pdf 2 | *.epub 3 | html/ 4 | *.docx 5 | *~ 6 | lib/ 7 | -------------------------------------------------------------------------------- /.travis.yml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/oslugr/curso-git/HEAD/.travis.yml -------------------------------------------------------------------------------- /LICENSE: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/oslugr/curso-git/HEAD/LICENSE -------------------------------------------------------------------------------- /README.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/oslugr/curso-git/HEAD/README.md -------------------------------------------------------------------------------- /aprendegit.css: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/oslugr/curso-git/HEAD/aprendegit.css -------------------------------------------------------------------------------- /conflicto: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/oslugr/curso-git/HEAD/conflicto -------------------------------------------------------------------------------- /metadata.xml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/oslugr/curso-git/HEAD/metadata.xml -------------------------------------------------------------------------------- /texto/Modulos.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/oslugr/curso-git/HEAD/texto/Modulos.md -------------------------------------------------------------------------------- /texto/aprendegit.txt: -------------------------------------------------------------------------------- 1 | # Aprende git 2 | 3 | # Pablo Hinojosa y JJ Merelo 4 | -------------------------------------------------------------------------------- /texto/ganchos.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/oslugr/curso-git/HEAD/texto/ganchos.md -------------------------------------------------------------------------------- /texto/github.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/oslugr/curso-git/HEAD/texto/github.md -------------------------------------------------------------------------------- /texto/img/blame.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/oslugr/curso-git/HEAD/texto/img/blame.png -------------------------------------------------------------------------------- /texto/img/by-sa.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/oslugr/curso-git/HEAD/texto/img/by-sa.png -------------------------------------------------------------------------------- /texto/img/conflicto.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/oslugr/curso-git/HEAD/texto/img/conflicto.png -------------------------------------------------------------------------------- /texto/img/diff-index.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/oslugr/curso-git/HEAD/texto/img/diff-index.png -------------------------------------------------------------------------------- /texto/img/diff-tree-2.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/oslugr/curso-git/HEAD/texto/img/diff-tree-2.png -------------------------------------------------------------------------------- /texto/img/diff-tree-3.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/oslugr/curso-git/HEAD/texto/img/diff-tree-3.png -------------------------------------------------------------------------------- /texto/img/fusion.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/oslugr/curso-git/HEAD/texto/img/fusion.png -------------------------------------------------------------------------------- /texto/img/github-blame.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/oslugr/curso-git/HEAD/texto/img/github-blame.png -------------------------------------------------------------------------------- /texto/img/githubform.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/oslugr/curso-git/HEAD/texto/img/githubform.png -------------------------------------------------------------------------------- /texto/img/gitk.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/oslugr/curso-git/HEAD/texto/img/gitk.png -------------------------------------------------------------------------------- /texto/img/instaweb-1.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/oslugr/curso-git/HEAD/texto/img/instaweb-1.png -------------------------------------------------------------------------------- /texto/img/instaweb-2.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/oslugr/curso-git/HEAD/texto/img/instaweb-2.png -------------------------------------------------------------------------------- /texto/img/ls-tree.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/oslugr/curso-git/HEAD/texto/img/ls-tree.png -------------------------------------------------------------------------------- /texto/img/masconflicto.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/oslugr/curso-git/HEAD/texto/img/masconflicto.png -------------------------------------------------------------------------------- /texto/img/otroconflicto.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/oslugr/curso-git/HEAD/texto/img/otroconflicto.png -------------------------------------------------------------------------------- /texto/img/post-rebase.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/oslugr/curso-git/HEAD/texto/img/post-rebase.png -------------------------------------------------------------------------------- /texto/img/pre-rebase.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/oslugr/curso-git/HEAD/texto/img/pre-rebase.png -------------------------------------------------------------------------------- /texto/img/rebase-y-commit.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/oslugr/curso-git/HEAD/texto/img/rebase-y-commit.png -------------------------------------------------------------------------------- /texto/img/tag.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/oslugr/curso-git/HEAD/texto/img/tag.png -------------------------------------------------------------------------------- /texto/img/tree-git.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/oslugr/curso-git/HEAD/texto/img/tree-git.png -------------------------------------------------------------------------------- /texto/img/wingit1.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/oslugr/curso-git/HEAD/texto/img/wingit1.png -------------------------------------------------------------------------------- /texto/img/wingit10.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/oslugr/curso-git/HEAD/texto/img/wingit10.png -------------------------------------------------------------------------------- /texto/img/wingit2.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/oslugr/curso-git/HEAD/texto/img/wingit2.png -------------------------------------------------------------------------------- /texto/img/wingit3.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/oslugr/curso-git/HEAD/texto/img/wingit3.png -------------------------------------------------------------------------------- /texto/img/wingit4.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/oslugr/curso-git/HEAD/texto/img/wingit4.png -------------------------------------------------------------------------------- /texto/img/wingit5.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/oslugr/curso-git/HEAD/texto/img/wingit5.png -------------------------------------------------------------------------------- /texto/img/wingit6.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/oslugr/curso-git/HEAD/texto/img/wingit6.png -------------------------------------------------------------------------------- /texto/img/wingit7.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/oslugr/curso-git/HEAD/texto/img/wingit7.png -------------------------------------------------------------------------------- /texto/img/wingit8.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/oslugr/curso-git/HEAD/texto/img/wingit8.png -------------------------------------------------------------------------------- /texto/img/wingit9.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/oslugr/curso-git/HEAD/texto/img/wingit9.png -------------------------------------------------------------------------------- /texto/include.css: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/oslugr/curso-git/HEAD/texto/include.css -------------------------------------------------------------------------------- /texto/introduccion.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/oslugr/curso-git/HEAD/texto/introduccion.md -------------------------------------------------------------------------------- /texto/mas_usos.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/oslugr/curso-git/HEAD/texto/mas_usos.md -------------------------------------------------------------------------------- /texto/prologo.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/oslugr/curso-git/HEAD/texto/prologo.md -------------------------------------------------------------------------------- /texto/solucion_problemas.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/oslugr/curso-git/HEAD/texto/solucion_problemas.md -------------------------------------------------------------------------------- /texto/uso_basico.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/oslugr/curso-git/HEAD/texto/uso_basico.md -------------------------------------------------------------------------------- /texto/words.dic: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/oslugr/curso-git/HEAD/texto/words.dic -------------------------------------------------------------------------------- /utils/md2docx: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/oslugr/curso-git/HEAD/utils/md2docx -------------------------------------------------------------------------------- /utils/md2epub: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/oslugr/curso-git/HEAD/utils/md2epub -------------------------------------------------------------------------------- /utils/md2html: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/oslugr/curso-git/HEAD/utils/md2html -------------------------------------------------------------------------------- /utils/md2pdf: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/oslugr/curso-git/HEAD/utils/md2pdf -------------------------------------------------------------------------------- /utils/md2pdf-kdp: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/oslugr/curso-git/HEAD/utils/md2pdf-kdp -------------------------------------------------------------------------------- /utils/plantilla-kdp.latex: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/oslugr/curso-git/HEAD/utils/plantilla-kdp.latex -------------------------------------------------------------------------------- /utils/plantilla.latex: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/oslugr/curso-git/HEAD/utils/plantilla.latex -------------------------------------------------------------------------------- /utils/urls-with-short.json: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/oslugr/curso-git/HEAD/utils/urls-with-short.json -------------------------------------------------------------------------------- /utils/urls.json: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/oslugr/curso-git/HEAD/utils/urls.json --------------------------------------------------------------------------------