diff options
| -rw-r--r-- | .gitconfig | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/.gitconfig b/.gitconfig new file mode 100644 index 0000000..5efdc97 --- /dev/null +++ b/.gitconfig @@ -0,0 +1,36 @@ +[user] + email = bluewind@xinu.at + name = Florian Pritz + signingkey = 0x4CE1C13E +[alias] + co = checkout + s = status + l = !"PAGER=less git log --graph --pretty=format:'%C(yellow)%h %Cred%ad %Cblue%an%Cgreen%d %Creset%s' --date=short" + m = commit -vs + ap = add -pi + cp = cherry-pick + dic = diff --cached --stat -p + d = diff --stat -p + am = am -s + c = cherry -v + b = branch -vv +[merge] + tool = vimdiff +[push] + default = current +[color] + ui = true +[sendemail] + smtpserver = /usr/bin/msmtp + envelopesender = bluewind@xinu.at + chainreplyto = false + suppresscc = self + #cccmd = git-cc +[mergetool "cp"] + cmd = cp \"$REMOTE\" \"$MERGED\" +[mergetool "vimdiff3"] + cmd = vim -f -d -c \"wincmd J\" \"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\" +[core] + excludesfile = ~/.gitignore +[log] + decorate = full |