Merge branch 'work'

git/gitconfig

@@ -2,6 +2,8 @@
     name = Hannes Körber
     email = hannes.koerber@haktec.de
     signingkey = 0x078A167A8741BD30
+[github]
+    user = hakoerber
 [alias]
     untrack = "rm --cached"
     unstage = "reset HEAD"
@@ -16,7 +18,9 @@
     st = "status"
     br = "branch"
     rb = "rebase"
-    rbi = "rebase -i"
+    rbi = "rebase --interactive"
+    rbc = "rebase --continue"
+    rba = "rebase --abort"
     df = "diff"
     gr = "! git graph"
 
@@ -36,11 +40,17 @@
 
     intercommit = !bash -c 'interdiff <(git show $1) <(git show $2) | less -FRS' -
 
+    drop = !git rebase --onto $1^ --
+
 [core]
-    whitespace = ""
-    excludesfile = "~/.gitignore_global"
+    fileMode = true
+    whitespace = "blank-at-eol,space-before-tab,blank-at-eof"
+    ; excludesfile = "~/.gitignore_global"
+    abbrev = 8
 [color]
     ui = true
+[column]
+    ui = auto
 [push]
 	default = simple
 [merge]
@@ -49,15 +59,29 @@
 	auto = 0
 [advice]
     pushNonFastForward = false
+    pushUpdateRejected = false
     statusHints = false
     commitBeforeMerge = false
+    detachedHead = false
 [commit]
     gpgSign = true
+    cleanup = default
+    status = true
 [status]
     relativePaths = false
+    submoduleSummary = true
 [pager]
 	log = less
 	show = less
 	diff = less
 [gpg]
 	program = gpg2
+[rebase]
+	autoSquash = true
+[diff]
+    submodule = log
+    mnemonicPrefix = true
+[branch]
+    autoSetupMerge = true
+[clean]
+    requireForce = true

git/gitignore_global

@@ -1,81 +0,0 @@
-# http://github.com/github/gitignore
-
-### Linux
-!.gitignore
-*~
-
-### Windows
-# image file caches
-Thumbs.db
-ehthumbs.db
-# Folder config file
-Desktop.ini
-# Recycle Bin used on file shares
-$RECYCLE.BIN/
-
-### Mac OSX
-.DS_Store
-.AppleDouble
-.LSOverride
-Icon
-# Thumbnails
-._*
-# Files that might appear on external disk
-.Spotlight-V100
-.Trashes
-
-### compiled source 
-*.com
-*.class
-*.dll
-*.exe
-*.o
-*.so
-
-### packages
-# it's better to unpack these files and commit the raw source
-# git has its own built in compression methods
-*.7z
-*.jar
-*.rar
-*.zip
-*.gz
-*.bzip
-*.bz2
-*.xz
-*.lzma
-
-### packing-only formats
-*.iso
-*.tar
-
-### package management formats
-*.dmg
-*.xpi
-*.gem
-*.egg
-*.deb
-*.rpm
-
-### logs and databases
-*.log
-*.sql
-*.sqlite
-
-### eclipse specific
-*.pydevproject
-.project
-.metadata
-local.properties
-.classpath
-.settings/
-.loadpath
-# External tool builders
-.externalToolBuilders/
-# Locally stored "Eclipse launch configurations"
-*.launch
-# CDT-specific
-.cproject
-# PDT-specific
-.buildpath
-