Skip to content

Instantly share code, notes, and snippets.

@mguenther
Created September 13, 2023 15:43
Show Gist options
  • Save mguenther/61d1a0f8a8a9dc2d3943e5db8d4e1945 to your computer and use it in GitHub Desktop.
Save mguenther/61d1a0f8a8a9dc2d3943e5db8d4e1945 to your computer and use it in GitHub Desktop.
[user]
email = markus.guenther@gmail.com
name = Markus Günther
[push]
default = matching
# Push created tags from the branch to the server as well
followTags = true
[core]
autocrlf = input
eol = lf
# This is important for collaborated work, as Unicode is secured between the systems
precomposeUnicode = true
# Enables hints for trailing spaces and spaces before tabs at the begining of a line
whitespace = space-before-tab,trailing-space
[diff]
# Uses a little more time, but makes sure that git diff is as small as possible
algorithm = minimal
# The diff prefix corresponds to the compared elements and is not called stubbornly a/ and b/
mnemonicprefix = true
# Improves the detection of renamed files
renames = copies
# Shows changes in submodules
submodule = log
tool = vimdiff
[fetch]
# Ensures that the remote branches (all) are updated (whether the branch has new commits
# or has been deleted)
prune = true
# Ensures that the remote tags (all) are updated (whether the tags have been deleted)
pruneTags = true
[rerere]
# Using the following two options, git can automatically resolve an already resolved
# conflict again at a later point in time without having to resolve it again
autoUpdate = true
enabled = true
[status]
# Shows the branch info as well as tracking info
branch = true
# Display changes to all submodules of the repository
submoduleSummary = true
[alias]
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
lnc = log --pretty=format:"%h\\ %s\\ [%cn]"
lds = log --pretty=format:"%C(yellow)%h\\ %ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=short
filelog = log -u
fl = log -u
la = "!git config -l | grep alias | cut -c 7-"
logtree = "log --graph --oneline --decorate --all"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment