From 6c9fd5cfafeda681876cbbb7cf3f799639d79528 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Tue, 10 Jan 2017 10:36:22 +0100 Subject: [PATCH] * .dir-locals.el (magit-branch-adjust-remote-upstream-alist): New. --- .dir-locals.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.dir-locals.el b/.dir-locals.el index 248d27bc0..21bd0aa64 100644 --- a/.dir-locals.el +++ b/.dir-locals.el @@ -1,7 +1,8 @@ ((nil . ((whitespace-action auto-cleanup) (whitespace-style face empty trailing lines-tail) (require-final-newline . t) - (mode . global-whitespace))) + (mode . global-whitespace) + (magit-branch-adjust-remote-upstream-alist ("origin/next" . "/")))) (c++-mode . ((c-default-style . "gnu") (indent-tab-mode . t) (tab-width . 8)