More changes.

2014-08-19 13:49:19 +02:00
parent 46c9c6de47
commit 00c8fe6f61
10 changed files with 114 additions and 114 deletions
--- a/git/gitconfig
+++ b/git/gitconfig
@@ -17,7 +17,6 @@
    rb = "rebase"
    df = "diff"

-
    last = "log -1 HEAD"

    logl = log --graph --decorate --pretty=oneline --abbrev-commit --all
@@ -37,3 +36,7 @@
 	tool = vimdiff
 [gc]
 	auto = 0
+[advice]
+    pushNonFastForward = false
+    statusHints = false
+    commitBeforeMerge = false