diff options
Diffstat (limited to 'tw/home/files/gitconfig')
| -rw-r--r-- | tw/home/files/gitconfig | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/tw/home/files/gitconfig b/tw/home/files/gitconfig deleted file mode 100644 index 6bed5cc8..00000000 --- a/tw/home/files/gitconfig +++ /dev/null @@ -1,43 +0,0 @@ -# This is Git's per-user configuration file. -[user] - name = Timo Wilken - email = timo.wilken@cern.ch - signingkey = C2249BBE5E8761C943A0CFA1B7B3914BF63ACD7C -[commit] - gpgsign = true -[url "https://"] - insteadOf = git:// -[url "ssh://git@gitlab.cern.ch:7999/"] - insteadOf = https://gitlab.cern.ch/ -[url "ssh://git@ssh.github.com/"] - insteadOf = gh: -[gui] - fontui = -family \"Fira Sans\" -size 10 -weight normal -slant roman -underline 0 -overstrike 0 - fontdiff = -family \"Hermit\" -size 10 -weight normal -slant roman -underline 0 -overstrike 0 - tabsize = 4 -[merge] - summary = true - conflictstyle = diff3 -[color] - ui = auto -[pull] - rebase = false - ff = only -[alias] - glog = log --decorate --graph --oneline - plog = log --decorate --graph --oneline --pretty=tformat:\"%C(yellow)%h %Cgreen%as %Cblue%<(10,trunc)%an%Cred%d%Creset %s\" -[init] - defaultBranch = master -[advice] - detachedHead = false -# https://sw.kovidgoyal.net/kitty/kittens/diff/ -[diff] - tool = kitty - guitool = kitty.gui -[difftool] - prompt = false - trustExitCode = true -[difftool "kitty"] - cmd = kitty +kitten diff $LOCAL $REMOTE -[difftool "kitty.gui"] - cmd = kitty kitty +kitten diff $LOCAL $REMOTE |