diff options
| author | Eli Zaretskii | 2024-11-30 06:44:06 -0500 |
|---|---|---|
| committer | Eli Zaretskii | 2024-11-30 06:44:06 -0500 |
| commit | 88f6b045f482d5d842eaed1d7e949e488e8cedd1 (patch) | |
| tree | b816c883b0ed01d9f1e6828c869a85c0b27013d6 /admin/notes | |
| parent | 82bdb3bfd035577a43afdf1eafd18ee1a60a987c (diff) | |
| parent | afb34a3b2393decb50e250ed8caa559b64020379 (diff) | |
| download | emacs-88f6b045f482d5d842eaed1d7e949e488e8cedd1.tar.gz emacs-88f6b045f482d5d842eaed1d7e949e488e8cedd1.zip | |
Merge from origin/emacs-30
afb34a3b239 ; Improve documentation of ':box' face attribute
b38eb6da1d1 Fix docstring of c-ts-mode-indent-style
9fdb764898d Support PHP 8.4 and more reliable indentation (bug#74525)
bda0bce9e43 Don't inadvertently reset frame scroll bar sizes (Bug#74435)
3f99cdaf26d Mention special variables in lexical binding documentation
0ef0f18f163 Allow to go back to using 'ruby-mode' after loading 'ruby...
fc17e8727d4 Delete obsolete section in admin/notes/repo
3e396b2c5bb Improve documentation for 'while-let'
50b91ed458d Remove mention of treesit-defun-prefer-top-level (bug#74474)
03ae07291e8 Fix NS non-native fullscreen on initial frame load (bug#5...
8261d7224d3 Fix user options for listing and marking diary files
# Conflicts:
# lisp/progmodes/c-ts-mode.el
Diffstat (limited to 'admin/notes')
| -rw-r--r-- | admin/notes/repo | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/admin/notes/repo b/admin/notes/repo index b4535bcb556..c5caec11e35 100644 --- a/admin/notes/repo +++ b/admin/notes/repo | |||
| @@ -77,16 +77,6 @@ variable in admin/merge-gnulib before running it. | |||
| 77 | If you remove a gnulib module, or if a gnulib module | 77 | If you remove a gnulib module, or if a gnulib module |
| 78 | removes a file, then remove the corresponding files by hand. | 78 | removes a file, then remove the corresponding files by hand. |
| 79 | 79 | ||
| 80 | * How to merge changes from emacs-24 to master | ||
| 81 | |||
| 82 | [The section on git merge procedure has not yet been written.] | ||
| 83 | |||
| 84 | You may see conflicts in autoload md5sums in comments. Strictly | ||
| 85 | speaking, the right thing to do is merge everything else, resolve the | ||
| 86 | conflict by choosing either the master or branch version, then run | ||
| 87 | 'make -C lisp autoloads' to update the md5sums to the correct master | ||
| 88 | value before committing. | ||
| 89 | |||
| 90 | * Re-adding a file that has been removed from the repository | 80 | * Re-adding a file that has been removed from the repository |
| 91 | 81 | ||
| 92 | Let's suppose you've done: | 82 | Let's suppose you've done: |