Diferències

Ací es mostren les diferències entre la revisió seleccionada i la versió actual de la pàgina.

Enllaç a la visualització de la comparació

--- tech:git:dotfiles [18/06/2025 08:37] – creat mate
+++ tech:git:dotfiles [13/07/2026 10:57] (actual) – [.gitattributes] mate
@@ Línia 1: / Línia 1: @@
-= .git
+= .git*
-== .gitignore
+{{tag>git}}
-<code>
-outgoing/*
-!outgoing/.gitkeep
-data/*
+  * [[tech:git:dotfiles:gitattributes]]
-!data/.gitkeep
+  * [[tech:git:dotfiles:gitignore]]
-code/*
+== .gitconfig
-!code/fingscan_linux
+  * ''~/.gitconfig'':
-!code/start.sh
+<code properties>
-!code/IBScanUltimate_x64_3.9.3.tgz
+[alias]
+        ck = checkout
-__pycache__/*
+        s = status
+        l = log --oneline --max-count=10
-credentials.csv
+        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 = branch
+        c = commit
+        bv = branch -avv
+        lv = log --walk-reflogs --max-count=10
+        ai = add --interactive
+        ss = status --short
+</code>
+<code properties>
+# https://gist.github.com/johnpolacek/69604a1f6861129ef088
+[alias]
+	co = checkout
+	cob = checkout -b
+	coo = !git fetch && git checkout
+	br = branch
+	brd = branch -d
+	brD = branch -D
+	merged = branch --merged
+	st = status
+	aa = add -A .
+	cm = commit -m
+	aacm = !git add -A . && git commit -m
+	cp = cherry-pick
+	amend = commit --amend -m
+	dev = !git checkout dev && git pull origin dev
+	staging = !git checkout staging && git pull origin staging
+	master = !git checkout master && git pull origin
+	po = push origin
+	pod = push origin dev
+	pos = push origin staging
+	pom = push origin master
+	poh = push origin HEAD
+	pogm = !git push origin gh-pages && git checkout master && git pull origin master && git rebase gh-pages && git push origin master && git checkout gh-pages
+	pomg = !git push origin master && git checkout gh-pages && git pull origin gh-pages && git rebase master && git push origin gh-pages && git checkout master
+	plo = pull origin
+	plod = pull origin dev
+	plos = pull origin staging
+	plom = pull origin master
+	ploh = pull origin HEAD
+	unstage = reset --soft HEAD^
+	ls = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate
+	ll = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat
+	f = "!git ls-files | grep -i"
+	gr = grep -Ii
+	la = "!git config -l | grep alias | cut -c 7-"
 </code>
 == .gitkeep
 Fichero vacío para indicar que ese directorio se ha de mantener, aunque no contenga más archivos.
-== .gitattributes
-indica la naturaleza de cierto tipos de archivos para optimizar el control de cambios.
-<code>*.tgz binary
-code/*.zip binary</code>