emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[nongnu] elpa/git-commit 99d9b3008a: magit-long-lived-branches: New vari


From: ELPA Syncer
Subject: [nongnu] elpa/git-commit 99d9b3008a: magit-long-lived-branches: New variable
Date: Thu, 8 Dec 2022 16:58:50 -0500 (EST)

branch: elpa/git-commit
commit 99d9b3008adf72a0c2cdb7df70b5ae03ea9271c8
Author: Jonas Bernoulli <jonas@bernoul.li>
Commit: Jonas Bernoulli <jonas@bernoul.li>

    magit-long-lived-branches: New variable
    
    Also update docstring of related `magit-main-branch-names'.
---
 lisp/magit-git.el | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/lisp/magit-git.el b/lisp/magit-git.el
index 30e299239c..07c027c812 100644
--- a/lisp/magit-git.el
+++ b/lisp/magit-git.el
@@ -2092,9 +2092,14 @@ PATH has to be relative to the super-repository."
   (car (member string (magit-list-remotes))))
 
 (defvar magit-main-branch-names
-  ;; These are the names that Git suggests
-  ;; if `init.defaultBranch' is undefined.
-  '("main" "master" "trunk" "development"))
+  '("main" "master" "trunk" "development")
+  "Branch names reserved for use by the primary branch.
+Use function `magit-main-branch' to get the name actually used in
+the current repository.")
+
+(defvar magit-long-lived-branches
+  (append magit-main-branch-names (list "maint" "next"))
+  "Branch names reserved for use by long lived branches.")
 
 (defun magit-main-branch ()
   "Return the main branch.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]