Jochen Sprickerhof
Last changed: 2020-01-09

Software

Git Config

[user]
    name = Name
    email = Mail

[alias]
    ci = commit
    st = status --show-stash
    co = checkout
    ft = fetch --tags
    wdiff = diff --color-words
    graph = log --graph --decorate --branches --remotes
    check = !git status && git log @{u}.. && git branch && git stash list
    lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset' --abbrev-commit --date=format:'%a %d.%m.%Y %H:%M'
    rlg = log --color --walk-reflogs --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %gs %Cgreen(%gD) %C(bold blue)<%an>%Creset' --abbrev-commit --date=format:'%a %d.%m.%Y %H:%M'
    pushf = push --force-with-lease
    stash-all = stash save --include-untracked
    new = log -p --reverse master@{1}..

[merge]
    tool = vimdiff
    conflictstyle = diff3

[mergetool]
    keepBackup = false

[rerere]
    enabled = 1

[rebase]
    autosquash = true
    stat = true

[push]
    followTags = true

[sendemail]
    smtpserver = "/usr/bin/msmtp"
    confirm = auto