mirror of https://github.com/kastdeur/dotfiles.git
Compare commits
3 Commits
320dd0baa5
...
1f17382622
Author | SHA1 | Date |
---|---|---|
Eric Teunis de Boone | 1f17382622 | |
Eric Teunis de Boone | 8c96a3d379 | |
Eric Teunis de Boone | 028eac240f |
Binary file not shown.
18
git/config
18
git/config
|
@ -6,18 +6,24 @@
|
|||
editor = geany
|
||||
[push]
|
||||
default = matching
|
||||
[diff "pdf"]
|
||||
textconv = pdf2txt
|
||||
[core]
|
||||
excludesfile = ~/.config/git/ignore
|
||||
[color]
|
||||
ui = auto
|
||||
[color "status"]
|
||||
# use different color than untracked and unmerged paths have
|
||||
changed = yellow
|
||||
[merge]
|
||||
conflictstyle = diff3
|
||||
[branch]
|
||||
autosetuprebase = always
|
||||
[diff]
|
||||
mnemonicPrefix = true
|
||||
tool = vimdiff
|
||||
[diff "rst"]
|
||||
textconv = pandoc --to=rst
|
||||
[diff "pdf"]
|
||||
textconv = pdf2txt
|
||||
[alias]
|
||||
# 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)'
|
||||
|
@ -25,5 +31,13 @@
|
|||
lg = !"git lg1"
|
||||
lga = !"git lg --all"
|
||||
|
||||
s = status --short
|
||||
st = status
|
||||
|
||||
pushf = push --force-with-lease # Look mom, no --force
|
||||
|
||||
dif = diff
|
||||
diffc = diff --cached
|
||||
difc = diff --cached
|
||||
|
||||
alias = "! git config --get-regexp ^alias\\. "
|
||||
|
|
Loading…
Reference in New Issue