<?xml version="1.0" encoding="UTF-8"?>
<!-- generator="FeedCreator 1.8" -->
<?xml-stylesheet href="https://miguelangel.torresegea.es/wiki/lib/exe/css.php?s=feed" type="text/css"?>
<rdf:RDF
    xmlns="http://purl.org/rss/1.0/"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:slash="http://purl.org/rss/1.0/modules/slash/"
    xmlns:dc="http://purl.org/dc/elements/1.1/">
    <channel rdf:about="https://miguelangel.torresegea.es/wiki/feed.php">
        <title>miguel angel torres egea</title>
        <description></description>
        <link>https://miguelangel.torresegea.es/wiki/</link>
        <image rdf:resource="https://miguelangel.torresegea.es/wiki/_media/wiki:dokuwiki-128.png" />
       <dc:date>2026-06-14T19:59:59+00:00</dc:date>
        <items>
            <rdf:Seq>
                <rdf:li rdf:resource="https://miguelangel.torresegea.es/wiki/tech:git:tips?rev=1752152433&amp;do=diff"/>
                <rdf:li rdf:resource="https://miguelangel.torresegea.es/wiki/tech:git:alias?rev=1754219992&amp;do=diff"/>
                <rdf:li rdf:resource="https://miguelangel.torresegea.es/wiki/tech:git:autopush?rev=1777903300&amp;do=diff"/>
                <rdf:li rdf:resource="https://miguelangel.torresegea.es/wiki/tech:git:config?rev=1752152736&amp;do=diff"/>
                <rdf:li rdf:resource="https://miguelangel.torresegea.es/wiki/tech:git:curs?rev=1684328851&amp;do=diff"/>
                <rdf:li rdf:resource="https://miguelangel.torresegea.es/wiki/tech:git:diff?rev=1761933636&amp;do=diff"/>
                <rdf:li rdf:resource="https://miguelangel.torresegea.es/wiki/tech:git:difftool?rev=1752152414&amp;do=diff"/>
                <rdf:li rdf:resource="https://miguelangel.torresegea.es/wiki/tech:git:fusion?rev=1752152535&amp;do=diff"/>
                <rdf:li rdf:resource="https://miguelangel.torresegea.es/wiki/tech:git:git-rename-branch?rev=1776244139&amp;do=diff"/>
                <rdf:li rdf:resource="https://miguelangel.torresegea.es/wiki/tech:git:replica?rev=1752152498&amp;do=diff"/>
                <rdf:li rdf:resource="https://miguelangel.torresegea.es/wiki/tech:git:server?rev=1615279052&amp;do=diff"/>
                <rdf:li rdf:resource="https://miguelangel.torresegea.es/wiki/tech:git:dotfiles:gitattributes?rev=1777903924&amp;do=diff"/>
            </rdf:Seq>
        </items>
    </channel>
    <image rdf:about="https://miguelangel.torresegea.es/wiki/_media/wiki:dokuwiki-128.png">
        <title>miguel angel torres egea</title>
        <link>https://miguelangel.torresegea.es/wiki/</link>
        <url>https://miguelangel.torresegea.es/wiki/_media/wiki:dokuwiki-128.png</url>
    </image>
    <item rdf:about="https://miguelangel.torresegea.es/wiki/tech:git:tips?rev=1752152433&amp;do=diff">
        <dc:format>text/html</dc:format>
        <dc:date>2025-07-10T13:00:33+00:00</dc:date>
        <dc:creator>Anonymous (anonymous@undisclosed.example.com)</dc:creator>
        <title>git tips</title>
        <link>https://miguelangel.torresegea.es/wiki/tech:git:tips?rev=1752152433&amp;do=diff</link>
        <description>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


	*  &lt;https://www.atlassian.com/es/git/tutorials/syncing/git-fetch&gt;
	*  &lt;https://www.atlassian.com/es/git/tutorials/using-branches/git-checkout&gt;
	*  &lt;https://www.atlassian.com/es/git/tutorials/using-branches/git-merge&gt;
	*  &lt;https://www.atlassian.com/es/git/tutorials/syncing/gi…</description>
    </item>
    <item rdf:about="https://miguelangel.torresegea.es/wiki/tech:git:alias?rev=1754219992&amp;do=diff">
        <dc:format>text/html</dc:format>
        <dc:date>2025-08-03T11:19:52+00:00</dc:date>
        <dc:creator>Anonymous (anonymous@undisclosed.example.com)</dc:creator>
        <title>git alias</title>
        <link>https://miguelangel.torresegea.es/wiki/tech:git:alias?rev=1754219992&amp;do=diff</link>
        <description>git alias

	*  &lt;https://git-scm.com/book/en/v2/Git-Basics-Git-Aliases&gt;

alias

	*  
git config --global alias.cm ‘-c “user.name=matebcn” commit’


/via: &lt;https://git-scm.com/book/en/v2/Git-Basics-Git-Aliases&gt;
+info: &lt;https://github.com/GitAlias/gitalias&gt;</description>
    </item>
    <item rdf:about="https://miguelangel.torresegea.es/wiki/tech:git:autopush?rev=1777903300&amp;do=diff">
        <dc:format>text/html</dc:format>
        <dc:date>2026-05-04T14:01:40+00:00</dc:date>
        <dc:creator>Anonymous (anonymous@undisclosed.example.com)</dc:creator>
        <title>git autopush shell script</title>
        <link>https://miguelangel.torresegea.es/wiki/tech:git:autopush?rev=1777903300&amp;do=diff</link>
        <description>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 &lt;- no he hecho funcionar o no aporta</description>
    </item>
    <item rdf:about="https://miguelangel.torresegea.es/wiki/tech:git:config?rev=1752152736&amp;do=diff">
        <dc:format>text/html</dc:format>
        <dc:date>2025-07-10T13:05:36+00:00</dc:date>
        <dc:creator>Anonymous (anonymous@undisclosed.example.com)</dc:creator>
        <title>git config</title>
        <link>https://miguelangel.torresegea.es/wiki/tech:git:config?rev=1752152736&amp;do=diff</link>
        <description>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]</description>
    </item>
    <item rdf:about="https://miguelangel.torresegea.es/wiki/tech:git:curs?rev=1684328851&amp;do=diff">
        <dc:format>text/html</dc:format>
        <dc:date>2023-05-17T13:07:31+00:00</dc:date>
        <dc:creator>Anonymous (anonymous@undisclosed.example.com)</dc:creator>
        <title>Anotaciones curso GIT</title>
        <link>https://miguelangel.torresegea.es/wiki/tech:git:curs?rev=1684328851&amp;do=diff</link>
        <description>Anotaciones curso GIT

	*  git init
	*  git add
	*  .gitignore
	*  git diff [--staged][--cached]
	*  git commit [-m «mensaje»][-a][--ammend]
	*  git config --global core.editor
		*  git config --global alias.unstage &#039;reset HEAD ~&#039;
		*  git config --</description>
    </item>
    <item rdf:about="https://miguelangel.torresegea.es/wiki/tech:git:diff?rev=1761933636&amp;do=diff">
        <dc:format>text/html</dc:format>
        <dc:date>2025-10-31T18:00:36+00:00</dc:date>
        <dc:creator>Anonymous (anonymous@undisclosed.example.com)</dc:creator>
        <title>git DIFF</title>
        <link>https://miguelangel.torresegea.es/wiki/tech:git:diff?rev=1761933636&amp;do=diff</link>
        <description>git DIFF

git comando

/via: &lt;https://devconnected.com/how-to-compare-two-git-branches/&gt;

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 &lt;commit-id&gt;
git diff-tree --no-commit-id --name-only -r &lt;commit-id&gt;</description>
    </item>
    <item rdf:about="https://miguelangel.torresegea.es/wiki/tech:git:difftool?rev=1752152414&amp;do=diff">
        <dc:format>text/html</dc:format>
        <dc:date>2025-07-10T13:00:14+00:00</dc:date>
        <dc:creator>Anonymous (anonymous@undisclosed.example.com)</dc:creator>
        <title>git diff[tool]</title>
        <link>https://miguelangel.torresegea.es/wiki/tech:git:difftool?rev=1752152414&amp;do=diff</link>
        <description>git diff[tool]

git

básicos


git diff @ # @ = HEAD



git show --stat --oneline &lt;commit-id&gt;
git diff-tree --no-commit-id --name-only -r &lt;commit-id&gt;


configuración difftool


#git config --global merge.tool kdiff3
#git config --global mergetool.kdiff3.path &quot;/usr/bin/kdiff3&quot;
#git config --global mergetool.kdiff3.trustExitCode false

git config --global --add diff.guitool kdiff3
git config --global difftool.kdiff3.path &quot;/usr/bin/kdiff3&quot;
git config --global difftool.kdiff3.trustExitCode false</description>
    </item>
    <item rdf:about="https://miguelangel.torresegea.es/wiki/tech:git:fusion?rev=1752152535&amp;do=diff">
        <dc:format>text/html</dc:format>
        <dc:date>2025-07-10T13:02:15+00:00</dc:date>
        <dc:creator>Anonymous (anonymous@undisclosed.example.com)</dc:creator>
        <title>git: fusion varios repos en 1 conservando historia</title>
        <link>https://miguelangel.torresegea.es/wiki/tech:git:fusion?rev=1752152535&amp;do=diff</link>
        <description>git: fusion varios repos en 1 conservando historia

git

/via: &lt;https://medium.com/@checko/merging-two-git-repositories-into-one-preserving-the-git-history-4e20d3fafa4e&gt;

	*  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</description>
    </item>
    <item rdf:about="https://miguelangel.torresegea.es/wiki/tech:git:git-rename-branch?rev=1776244139&amp;do=diff">
        <dc:format>text/html</dc:format>
        <dc:date>2026-04-15T09:08:59+00:00</dc:date>
        <dc:creator>Anonymous (anonymous@undisclosed.example.com)</dc:creator>
        <title>Git rename branch (master to main)</title>
        <link>https://miguelangel.torresegea.es/wiki/tech:git:git-rename-branch?rev=1776244139&amp;do=diff</link>
        <description>Git rename branch (master to main)

git

procedimiento

	*  renombrar rama en local:

# 1. En tu PC, renombra master a main
git branch -m master main

# 2. Sube la nueva rama main a Gitea
git push origin main


	*  cambiar rama por defecto en Gitea (settings</description>
    </item>
    <item rdf:about="https://miguelangel.torresegea.es/wiki/tech:git:replica?rev=1752152498&amp;do=diff">
        <dc:format>text/html</dc:format>
        <dc:date>2025-07-10T13:01:38+00:00</dc:date>
        <dc:creator>Anonymous (anonymous@undisclosed.example.com)</dc:creator>
        <title>git: replicación o duplicación de repositorios</title>
        <link>https://miguelangel.torresegea.es/wiki/tech:git:replica?rev=1752152498&amp;do=diff</link>
        <description>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:</description>
    </item>
    <item rdf:about="https://miguelangel.torresegea.es/wiki/tech:git:server?rev=1615279052&amp;do=diff">
        <dc:format>text/html</dc:format>
        <dc:date>2021-03-09T08:37:32+00:00</dc:date>
        <dc:creator>Anonymous (anonymous@undisclosed.example.com)</dc:creator>
        <title>git repo server</title>
        <link>https://miguelangel.torresegea.es/wiki/tech:git:server?rev=1615279052&amp;do=diff</link>
        <description>git repo server

seguridad

protocolos

&lt;https://git-scm.com/book/en/v2/Git-on-the-Server-The-Protocols#The-HTTP/S-Protocol&gt;

	*  local
	*  http(s)
		*  Smart HTTP
		*  Dumb HTTP

	*  ssh
	*  git

ssh

	*  git-shell
		*  usermod -s /usr/bin/git-shell &lt;username&gt;

	*  /etc/ssh/sshd_config:

Match User git
    ForceCommand /usr/bin/git
    AllowTCPForwarding no
    X11Forwarding no</description>
    </item>
    <item rdf:about="https://miguelangel.torresegea.es/wiki/tech:git:dotfiles:gitattributes?rev=1777903924&amp;do=diff">
        <dc:format>text/html</dc:format>
        <dc:date>2026-05-04T14:12:04+00:00</dc:date>
        <dc:creator>Anonymous (anonymous@undisclosed.example.com)</dc:creator>
        <title>.git* - .gitattributes</title>
        <link>https://miguelangel.torresegea.es/wiki/tech:git:dotfiles:gitattributes?rev=1777903924&amp;do=diff</link>
        <description>.git* - .gitattributes

indica la naturaleza de cierto tipos de archivos para optimizar el control de cambios.

*.tgz binary
code/*.zip binary

	*  diff:Le indica a Git cómo comparar dos versiones del archivo.
		*  Sin esto, Git intentaría comparar los archivos binarios (lo cual es inútil y consume mucha CPU).</description>
    </item>
</rdf:RDF>
