From: Stefan Bund Date: Wed, 17 Dec 2014 15:40:58 +0000 (+0100) Subject: change default magit tracking branch name style X-Git-Url: http://g0dil.de/git?a=commitdiff_plain;h=ca82433006733a3ce9baff9dd78e6021433546d7;hp=3be6d2324e1f519eccef642f7caed0d3c9fb06bb;p=emacs-init.git change default magit tracking branch name style --- 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.