https://miguelangel.torresegea.es/wiki/ 2026-05-23T17:57:29+00:00 https://miguelangel.torresegea.es/wiki/ https://miguelangel.torresegea.es/wiki/_media/wiki:dokuwiki-128.png text/html 2026-04-16T08:51:22+00:00 Anonymous (anonymous@undisclosed.example.com) https://miguelangel.torresegea.es/wiki/tech:git:start?rev=1776329482&do=diff GIT devops info related comandos cursos + info * git repo server * Anotaciones curso GIT * Crear repositorio de solo lectura (para algunos) cheatsheet * <https://github.com/arslanbilal/git-cheat-sheet/blob/master/other-sheets/git-cheat-sheet-es.md> * * · · * * * * <https://education.github.com/git-cheat-sheet-education.pdf> * * * <https://nvie.com/posts/a-successful-git-branching-model/> doc * <https://git-scm.com/book/es/v2> * <https://esparta.… text/html 2025-07-10T13:00:33+00:00 Anonymous (anonymous@undisclosed.example.com) https://miguelangel.torresegea.es/wiki/tech:git:tips?rev=1752152433&do=diff git tips git git fetch VS git pull * git pull = git fetch (+ git checkout) + git merge * modo seguro: git fetch origin git log --oneline main..origin/main git checkout main git log origin/main git merge origin/main * <https://www.atlassian.com/es/git/tutorials/syncing/git-fetch> * <https://www.atlassian.com/es/git/tutorials/using-branches/git-checkout> * <https://www.atlassian.com/es/git/tutorials/using-branches/git-merge> * <https://www.atlassian.com/es/git/tutorials/syncing/gi… text/html 2021-03-09T08:37:32+00:00 Anonymous (anonymous@undisclosed.example.com) https://miguelangel.torresegea.es/wiki/tech:git:server?rev=1615279052&do=diff git repo server seguridad protocolos <https://git-scm.com/book/en/v2/Git-on-the-Server-The-Protocols#The-HTTP/S-Protocol> * local * http(s) * Smart HTTP * Dumb HTTP * ssh * git ssh * git-shell * usermod -s /usr/bin/git-shell <username> * /etc/ssh/sshd_config: Match User git ForceCommand /usr/bin/git AllowTCPForwarding no X11Forwarding no text/html 2025-08-03T11:19:52+00:00 Anonymous (anonymous@undisclosed.example.com) https://miguelangel.torresegea.es/wiki/tech:git:alias?rev=1754219992&do=diff git alias * <https://git-scm.com/book/en/v2/Git-Basics-Git-Aliases> alias * git config --global alias.cm ‘-c “user.name=matebcn” commit’ /via: <https://git-scm.com/book/en/v2/Git-Basics-Git-Aliases> +info: <https://github.com/GitAlias/gitalias> text/html 2025-07-10T13:00:14+00:00 Anonymous (anonymous@undisclosed.example.com) https://miguelangel.torresegea.es/wiki/tech:git:difftool?rev=1752152414&do=diff git diff[tool] git básicos git diff @ # @ = HEAD git show --stat --oneline <commit-id> git diff-tree --no-commit-id --name-only -r <commit-id> configuración difftool #git config --global merge.tool kdiff3 #git config --global mergetool.kdiff3.path "/usr/bin/kdiff3" #git config --global mergetool.kdiff3.trustExitCode false git config --global --add diff.guitool kdiff3 git config --global difftool.kdiff3.path "/usr/bin/kdiff3" git config --global difftool.kdiff3.trustExitCode false text/html 2025-07-10T13:01:58+00:00 Anonymous (anonymous@undisclosed.example.com) https://miguelangel.torresegea.es/wiki/tech:git:submodule?rev=1752152518&do=diff git submodulos git clonar incluyendo submódulos git clone --recurse-submodules -j8 <url-git> git clone --recursive -j8 <url-git> # -j8 solo disponible a partir de la 2.8 git clone --recursive <url-git> si el repositorio ya estaba clonado: git clone <url-git> cd <path-git-submodule> git submodule update --init --recursive text/html 2026-05-04T14:01:40+00:00 Anonymous (anonymous@undisclosed.example.com) https://miguelangel.torresegea.es/wiki/tech:git:autopush?rev=1777903300&do=diff git autopush shell script git script bash para hacer un commit de un repositorio GIT de manera automatizada * añadir a cron para ejecución automatizada. * hay que configurar el remote: * git config credential.helper <- no he hecho funcionar o no aporta text/html 2025-07-10T13:05:36+00:00 Anonymous (anonymous@undisclosed.example.com) https://miguelangel.torresegea.es/wiki/tech:git:config?rev=1752152736&do=diff git config git glosario * HEAD == @ * HEAD^ : commit anterior al HEAD * HEAD@{1.month} * - (guión) : te devuelve a la rama que acabas de dejar config * ubicación: * system : /etc/gitconfig [--system] * global : ~/.gitconfig [--global] text/html 2025-10-31T18:00:36+00:00 Anonymous (anonymous@undisclosed.example.com) https://miguelangel.torresegea.es/wiki/tech:git:diff?rev=1761933636&do=diff git DIFF git comando /via: <https://devconnected.com/how-to-compare-two-git-branches/> diferencias en ficheros * mostrar diferencias entre working area y último commit: git diff @ # @ = HEAD * mostrar ficheros cambiados respecto a un commit: git show --stat --oneline <commit-id> git diff-tree --no-commit-id --name-only -r <commit-id> text/html 2026-05-04T14:02:34+00:00 Anonymous (anonymous@undisclosed.example.com) https://miguelangel.torresegea.es/wiki/tech:git:dotfiles?rev=1777903354&do=diff .git* git .gitconfig * ~/.gitconfig: [alias] ck = checkout s = status l = log --oneline --max-count=10 ll = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat lg = log --oneline --decorate --graph ls = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate alias = ! git config --get-regexp ^alias\\. | sed -e s/^alias\\.// -e s/\\ /\\ =\\ / a = add b = branc… text/html 2025-07-10T13:02:15+00:00 Anonymous (anonymous@undisclosed.example.com) https://miguelangel.torresegea.es/wiki/tech:git:fusion?rev=1752152535&do=diff git: fusion varios repos en 1 conservando historia git /via: <https://medium.com/@checko/merging-two-git-repositories-into-one-preserving-the-git-history-4e20d3fafa4e> * creamos nuevo repo + primer commit (no remote necesario en este momento para este repo) * añadimos el remote del primer repo que queremos fusionar: git remote add -f first_repo `link_to_first_repo` git merge --allow-unrelated-histories first_repo/master text/html 2026-05-04T14:05:16+00:00 Anonymous (anonymous@undisclosed.example.com) https://miguelangel.torresegea.es/wiki/tech:git:lfs?rev=1777903516&do=diff git LFS git comando Large File Storage/via: <https://support.atlassian.com/bitbucket-cloud/docs/use-git-lfs-with-bitbucket/> install sudo apt install git-lfs setup (nuevos repos) * instalación cliente: git lfs install --local # si no se especifica --local, afecta a todos los repos de la sesión, con --local solo al actual * configuración: text/html 2025-07-10T13:14:13+00:00 Anonymous (anonymous@undisclosed.example.com) https://miguelangel.torresegea.es/wiki/tech:git:migrar?rev=1752153253&do=diff git: migrar repositorio git Esta página contiene errores subsanados en la explicación /vía: <https://maureenbarahona.medium.com/migrar-un-repositorio-con-todos-sus-commits-y-todas-sus-ramas-ccd2c5e6d389> * crear un repositorio vacío en el proveedor de destino * clonar el repositorio que queremos cambiar de proveedor git clone... * cambiar el origen del repositorio text/html 2025-07-10T13:01:38+00:00 Anonymous (anonymous@undisclosed.example.com) https://miguelangel.torresegea.es/wiki/tech:git:replica?rev=1752152498&do=diff git: replicación o duplicación de repositorios git # partiendo de un repositorio existente y uno recién creado cp -r $PATH_REPO $PATH_REPO_NEW (habría que hacer un --bare antes?) git remote -set-url origin $URL_REPO_NEW git push --mirror origin /vía: