X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=emacs-custom.el;h=e088a2918b75a8fb5782d289b4e3b11e23f64081;hb=ca82433006733a3ce9baff9dd78e6021433546d7;hp=f7933dce395d74032a4391bad60134eb81cdab2d;hpb=75de9b7e3aa0b2375ed73e0ea729431ab1ccfbe4;p=emacs-init.git

diff --git a/emacs-custom.el b/emacs-custom.el
index f7933dc..e088a29 100644
--- a/emacs-custom.el
+++ b/emacs-custom.el
@@ -53,6 +53,7 @@
  '(ispell-program-name "c:/cygwin/bin/aspell.exe")
  '(line-move-visual nil)
  '(ls-lisp-dirs-first t)
+ '(magit-default-tracking-name-function (quote magit-default-tracking-name-branch-only))
  '(magit-process-popup-time 1)
  '(magit-server-window-for-rebase (quote pop-to-buffer))
  '(magit-status-buffer-switch-function (quote switch-to-buffer))
@@ -80,7 +81,7 @@
  '(which-function-mode nil)
  '(whitespace-action (quote (auto-cleanup warn-if-read-only)))
  '(whitespace-line-column 100)
- '(whitespace-style (quote (face trailing space-before-tab newline indentation empty space-after-tab lines)))
+ '(whitespace-style (quote (face trailing space-before-tab newline indentation empty space-after-tab lines-tail)))
  '(x-select-enable-clipboard t))
 (custom-set-faces
   ;; custom-set-faces was added by Custom.