kastdeur
/
dotfiles
mirror of https://github.com/kastdeur/dotfiles.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Compare commits

base: kastdeur:320dd0baa5a971f7a74b08a2edba9ff4ced4711a
Branches Tags
kastdeur:master
...
compare: kastdeur:1f173826223ab6eeacb36a11236ea35a82375c3d
Branches Tags
kastdeur:master

3 Commits
320dd0baa5 ... 1f17382622

Author SHA1 Message Date
Eric Teunis de Boone 1f17382622 [git] add simple aliases 2022-03-30 18:26:04 +02:00
Eric Teunis de Boone 8c96a3d379 [git] set changed colour to yellow 2022-03-30 18:24:23 +02:00
Eric Teunis de Boone 028eac240f [git] diff docx and odt using pandoc 2022-03-30 18:23:06 +02:00
2 changed files with 16 additions and 2 deletions
Show Stats Expand all files Collapse all files

BIN
git/.config.swp Normal file
View File

Binary file not shown.

18
git/config
View File

@ -6,18 +6,24 @@
editor = geany editor = geany
[push] [push]
default = matching default = matching
[diff "pdf"]
textconv = pdf2txt
[core] [core]
excludesfile = ~/.config/git/ignore excludesfile = ~/.config/git/ignore
[color] [color]
ui = auto ui = auto
[color "status"]
# use different color than untracked and unmerged paths have
changed = yellow
[merge] [merge]
conflictstyle = diff3 conflictstyle = diff3
[branch] [branch]
autosetuprebase = always autosetuprebase = always
[diff] [diff]
mnemonicPrefix = true
tool = vimdiff tool = vimdiff
[diff "rst"]
textconv = pandoc --to=rst
[diff "pdf"]
textconv = pdf2txt
[alias] [alias]
# Short Fancy Logs # Short Fancy Logs
lg1 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' lg1 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)'
@ -25,5 +31,13 @@
lg = !"git lg1" lg = !"git lg1"
lga = !"git lg --all" lga = !"git lg --all"
s = status --short
st = status
pushf = push --force-with-lease # Look mom, no --force
dif = diff dif = diff
diffc = diff --cached
difc = diff --cached
alias = "! git config --get-regexp ^alias\\. " alias = "! git config --get-regexp ^alias\\. "