From 2258a1256dd75970121e34fca6a3ca6c141c05f1 Mon Sep 17 00:00:00 2001 From: Knut Ahlers Date: Thu, 21 Jul 2016 15:41:17 +0200 Subject: [PATCH] add GIT configuration --- .gitconfig | 57 +++++++++++++++++++++++++++++++++++++++++++++++ .gitignore_global | 30 +++++++++++++++++++++++++ 2 files changed, 87 insertions(+) create mode 100644 .gitconfig create mode 100644 .gitignore_global diff --git a/.gitconfig b/.gitconfig new file mode 100644 index 0000000..d098f01 --- /dev/null +++ b/.gitconfig @@ -0,0 +1,57 @@ +[user] + name = Knut Ahlers + email = knut@ahlers.me + signingkey = D34BE99E + +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true + warnAmbiguousRefs = false + excludesfile = /Users/luzifer/.gitignore_global + +[color] + diff = auto + status = auto + branch = auto + +[commit] + gpgsign = true + +[branch] + autosetuprebase = always + +[diff] + renames = true + +[push] + default = tracking + gpgSign = if-asked + +[alias] + changes=diff --name-status -r + st = status + ci = commit + br = branch + co = checkout + df = diff + lg = log -p + cues = blame + elog = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative + starecopu = "!sh -c 'git stash && git pull --rebase && git stash pop && git commit -am \"$0\" && git push'" + spps = "!sh -c 'git stash && git pull --rebase && git push && git stash pop'" + pp = "!sh -c 'git pull --rebase && git push'" + squash = !sh -c 'git commit -m \"squash! $(git log -1 --format='\\''%s'\\'' $@)\"' - + ri = rebase --interactive --autosquash + lg = "log --color --graph --pretty=format:'%Cred%h%Creset [%G?]%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit" + sign-rebase = "!GIT_SEQUENCE_EDITOR='sed -i -re s/^pick/e/' sh -c 'git rebase -i $1 && git commit --amend -S --no-edit && while git rebase --continue; do git commit --amend -S --no-edit; done' -" + +[receive] + denyNonFastForwards = true + +[rerere] + enabled = 1 + +[gpg] + program = gpg2 diff --git a/.gitignore_global b/.gitignore_global new file mode 100644 index 0000000..08cd458 --- /dev/null +++ b/.gitignore_global @@ -0,0 +1,30 @@ +# Compiled source # +################### +*.class +*.dll +*.exe +*.o +*.so + +# Logs and databases # +###################### +*.log +*.sql +*.sqlite + +# OS generated files # +###################### +.DS_Store +.DS_Store? +._* +.Spotlight-V100 +.Trashes +Icon? +ehthumbs.db +Thumbs.db + +# IDE specific files # +##################### +.idea + +.*.swp