Commit 08af58c8 authored by Hermann Mayer's avatar Hermann Mayer

BashRC: Updated the git configuration.

parent 0ea78e61
[user]
name = Hermann Mayer
email = jack@hermann-mayer.net
email = hermann.mayer92@gmail.com
signingkey = 0x388D16A5B4C1CF12
[color]
diff = auto
......@@ -22,6 +23,7 @@
[push]
default = simple
followTags = true
[alias]
st = status
......@@ -44,14 +46,20 @@
f = fetch
b = branch -va
l = log
weg = push
f = fetch
d = diff
weg = push
; [merge]
; tool = meld
; [mergetool "meld"]
; path = ~/.linux-environment/vendors/bright-meld
[merge]
tool = meld
[mergetool "meld"]
path = ~/.linux-environment/vendors/bright-meld
[clean]
requireForce = false
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment