diff options
| author | Michael R. Mauger | 2017-04-02 18:10:57 -0400 |
|---|---|---|
| committer | Michael R. Mauger | 2017-04-02 18:10:57 -0400 |
| commit | 77083e2d34ba5559ae2899d3b03cf08c2e6c5ad4 (patch) | |
| tree | 27da92c2a61d664b700860c2d527a4d36000ca37 /admin | |
| parent | c5a31f8292c94d19b80a3dbe0b3026693cc1090e (diff) | |
| parent | 8e394a7f35c2ba9297d222faa2689e177f268924 (diff) | |
| download | emacs-77083e2d34ba5559ae2899d3b03cf08c2e6c5ad4.tar.gz emacs-77083e2d34ba5559ae2899d3b03cf08c2e6c5ad4.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/MAINTAINERS | 12 | ||||
| -rw-r--r-- | admin/gitmerge.el | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/admin/MAINTAINERS b/admin/MAINTAINERS index 5aff8242887..c13cb552a78 100644 --- a/admin/MAINTAINERS +++ b/admin/MAINTAINERS | |||
| @@ -82,11 +82,11 @@ Simen Heggestøyl | |||
| 82 | 82 | ||
| 83 | Nicolas Petton | 83 | Nicolas Petton |
| 84 | lisp/emacs-lisp/map.el | 84 | lisp/emacs-lisp/map.el |
| 85 | test/automated/map-tests.el | 85 | test/lisp/emac-lisp/map-tests.el |
| 86 | lisp/emacs-lisp/seq.el | 86 | lisp/emacs-lisp/seq.el |
| 87 | test/automated/seq-tests.el | 87 | test/lisp/emac-lisp/seq-tests.el |
| 88 | lisp/emacs-lisp/thunk.el | 88 | lisp/emacs-lisp/thunk.el |
| 89 | test/automated/thunk-tests.el | 89 | test/lisp/emac-lisp/thunk-tests.el |
| 90 | 90 | ||
| 91 | The GNU AUCTeX maintainers (auctex-devel@gnu.org) | 91 | The GNU AUCTeX maintainers (auctex-devel@gnu.org) |
| 92 | RefTeX | 92 | RefTeX |
| @@ -104,7 +104,7 @@ The GNU AUCTeX maintainers (auctex-devel@gnu.org) | |||
| 104 | 104 | ||
| 105 | Dmitry Gutov | 105 | Dmitry Gutov |
| 106 | lisp/progmodes/ruby-mode.el | 106 | lisp/progmodes/ruby-mode.el |
| 107 | test/automated/ruby-mode-tests.el | 107 | test/lisp/progmodes/ruby-mode-tests.el |
| 108 | test/indent/ruby.rb | 108 | test/indent/ruby.rb |
| 109 | lisp/progmodes/xref.el | 109 | lisp/progmodes/xref.el |
| 110 | lisp/progmodes/project.el | 110 | lisp/progmodes/project.el |
| @@ -119,11 +119,11 @@ Ulf Jasper | |||
| 119 | lisp/net/newst-ticker.el | 119 | lisp/net/newst-ticker.el |
| 120 | lisp/net/newst-treeview.el | 120 | lisp/net/newst-treeview.el |
| 121 | lisp/net/newsticker.el | 121 | lisp/net/newsticker.el |
| 122 | test/automated/newsticker-tests.el | 122 | test/lisp/net/newsticker-tests.el |
| 123 | 123 | ||
| 124 | Icalendar | 124 | Icalendar |
| 125 | lisp/calendar/icalendar.el | 125 | lisp/calendar/icalendar.el |
| 126 | test/automated/icalendar-tests.el | 126 | test/lisp/calendar/icalendar-tests.el |
| 127 | 127 | ||
| 128 | ============================================================================== | 128 | ============================================================================== |
| 129 | 2. Areas that someone is willing to maintain, although he would not | 129 | 2. Areas that someone is willing to maintain, although he would not |
diff --git a/admin/gitmerge.el b/admin/gitmerge.el index c3981dd4b06..a0efce5ea69 100644 --- a/admin/gitmerge.el +++ b/admin/gitmerge.el | |||
| @@ -50,7 +50,7 @@ | |||
| 50 | (defvar gitmerge-skip-regexp | 50 | (defvar gitmerge-skip-regexp |
| 51 | ;; We used to include "sync" in there, but in my experience it only | 51 | ;; We used to include "sync" in there, but in my experience it only |
| 52 | ;; caused false positives. --Stef | 52 | ;; caused false positives. --Stef |
| 53 | "back[- ]?port\\|cherry picked from commit\\|\\(do not\\|no need to\\) merge\\|\ | 53 | "back[- ]?port\\|cherry picked from commit\\|\\(do\\( no\\|n['’]\\)t\\|no need to\\) merge\\|\ |
| 54 | re-?generate\\|bump version\\|from trunk\\|Auto-commit" | 54 | re-?generate\\|bump version\\|from trunk\\|Auto-commit" |
| 55 | "Regexp matching logs of revisions that might be skipped. | 55 | "Regexp matching logs of revisions that might be skipped. |
| 56 | `gitmerge-missing' will ask you if it should skip any matches.") | 56 | `gitmerge-missing' will ask you if it should skip any matches.") |