aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Löthberg <johannes@kyriasis.com>2015-03-05 18:45:13 +0100
committerJohannes Löthberg <johannes@kyriasis.com>2015-03-05 18:45:13 +0100
commit051c62177bf6d397cc64d991168c2194b3f52326 (patch)
tree8e531780e04a113327d2ba9e3ce5183cfd801256
parentb7f7c25a4cb4d02dce60e47d13ab8087b620cc13 (diff)
downloaddotfiles-051c62177bf6d397cc64d991168c2194b3f52326.tar.xz
git: Add updated config files
-rw-r--r--git/aliases1
-rw-r--r--git/config121
-rw-r--r--git/ignore4
3 files changed, 108 insertions, 18 deletions
diff --git a/git/aliases b/git/aliases
new file mode 100644
index 0000000..799b84b
--- /dev/null
+++ b/git/aliases
@@ -0,0 +1 @@
+alias pacman pacman-dev@archlinux.org
diff --git a/git/config b/git/config
index c7a978b..239978b 100644
--- a/git/config
+++ b/git/config
@@ -2,34 +2,119 @@
name = Johannes Löthberg
email = johannes@kyriasis.com
signingkey = 3A9D0BB5
-[color]
- ui = true
- diff = auto
-[push]
- default = simple
-[branch]
- autosetuprebase = always
+
[alias]
- co = checkout
+ amend = commit --amend --verbose
br = branch
- ci = commit
+ ci = commit --verbose
+ co = checkout
+ di = diff
+ dc = diff --cached
+ empty = !git init && git commit --allow-empty -m \"Initial commit\"
+ follow = log --oneline --follow --stat --summary --
+ last = log -1 HEAD
+ lg = log --oneline --decorate
+ mend = commit --amend --reuse-message HEAD
+ mrproper = !git reset --hard HEAD && git clean -fdx
+ ours = !git checkout --ours $@
+ out = log --oneline --decorate @{upstream}..
+ rbc = rebase --continue
+ rbs = rebase -i
+ re = rebase
+ rec = rebase --continue
st = status
+ stat = diff --stat
+ statc = diff --cached --stat
+ tagv = !git tag -v $(git describe --abbrev=0)
+ theirs = !git checkout --theirs $@
+ tip = !git --no-pager log -1 --decorate --abbrev-commit --date=relative --show-signature
+ undo = reset --soft HEAD^
unstage = reset HEAD --
- last = log -1 HEAD
-[github]
- user = kyrias
+ up = remote update
+ wdiff = diff --word-diff
+ wshow = show --word-diff
+ fpush = push --force-with-lease
+
+[advice]
+ detachedHead = false
+
+[am]
+ messageid = true
+
+[branch]
+ autosetuprebase = always
+
+[color]
+ ui = true
+ branch = true
+ diff = true
+ status = true
+
+[column]
+ branch = never
+ status = never
+ tag = auto dense
+
[core]
- editor = vim
+ # never use an askpass even if $SSH_ASKPASS is set
+ askpass =
+ logAllRefUpdates = true
pager = less -x1,5
+
+[diff]
+ renames = copies
+
+[diff "gpg"]
+ textconv = gpg -v
+ xfuncname = "^((pub|uid) .*)"
+
+[diff "ldif"]
+ xfuncname = "^(dn: .+)$"
+
+[gc]
+ reflogExpire = 365 days
+ reflogExpireUnreachable = 365 days
+
+[github]
+ user = kyrias
+ password = !pass show web/github.com | head -1
+
+[grep]
+ lineNumber = true
+ extendedRegexp = true
+
+[log]
+ decorate = full
+
[merge]
tool = vimdiff
+ conflictStyle = diff3
+
+[push]
+ default = current
+
+[repack]
+ writebitmaps = true
+ autosquash = true
+
+[receive]
+ denyCurrentBranch = updateInstead
+
[sendemail]
- smtpserver = "/usr/bin/msmtp"
+ aliasfiletype = mutt
+ aliasesfile = /home/kyrias/.config/git/aliases
+ envelopesender = johannes@kyriasis.com
+ smtpserver = /usr/bin/msmtp
smtpserveroption = "-C"
smtpserveroption = "/home/kyrias/.config/msmtprc"
-[credential]
- helper = /usr/share/git/credential/gnome-keyring/git-credential-gnome-keyring
+ supresscc = self
+
[status]
showuntrackedfiles = no
-[pack]
- writebitmaps = true
+
+[url "git@github.com:"]
+ pushInsteadOf = git://github.com/
+ pushInsteadOf = https://github.com/
+
+[url "git@git.kyriasis.com"]
+ insteadOf = kyriasis:
diff --git a/git/ignore b/git/ignore
new file mode 100644
index 0000000..7e68472
--- /dev/null
+++ b/git/ignore
@@ -0,0 +1,4 @@
+*.a
+*.o
+*.py[co]
+__pycache__