aboutsummaryrefslogtreecommitdiff
path: root/orgmode-backports.org
diff options
context:
space:
mode:
Diffstat (limited to 'orgmode-backports.org')
-rw-r--r--orgmode-backports.org41
1 files changed, 37 insertions, 4 deletions
diff --git a/orgmode-backports.org b/orgmode-backports.org
index 250b431..05e70fa 100644
--- a/orgmode-backports.org
+++ b/orgmode-backports.org
@@ -54,14 +54,47 @@ After resolving the conflict, run
NOTE: Look for "ONSYNC" for changes that should be considered when
syncing, but that don't seem appropriate for Org backport.
-** master branch [1/1]
+** master branch [6/6]
:PROPERTIES:
-:ref: origin/master
+:ref: origin/master
+:exclude-ref: origin/emacs-29
:END:
-- [X] 26267040549da6e7f8223bea3b5344d0d5bef527
+- [X] 2f0bd8167c015bab729b998daa1e77d24d54ced4
+
+ Merge from origin/emacs-29
+ Po Lu
+ Fri Dec 9 09:31:37 2022 +0800
+
+- [X] 6c06379c030908a8106bc0f0290d472f67aa503c
+
+ Merge from origin/emacs-29
+ Eli Zaretskii
+ Thu Dec 8 12:52:37 2022 -0500
+
+- [X] 7d6f9753ade57821f5c409bcdeea700be8e53a74
+
+ Merge from origin/emacs-29
+ Stefan Kangas
+ Thu Dec 1 16:54:53 2022 +0100
- emacs-29 marker
+- [X] f7c3abb8d2d3a3d26a1198fed8157111bed41d6c
+
+ Merge from origin/emacs-29
+ Stefan Kangas
+ Thu Dec 1 14:38:29 2022 +0100
+
+- [X] 65468109a53c605df991f72521de5ed3b63ba6b8
+
+ Merge from origin/emacs-29
+ Po Lu
+ Thu Dec 1 14:24:43 2022 +0800
+
+- [X] f3ef75107ba91f1bc5e6f1e11bee5fabab2458e1
+
+ Merge from origin/emacs-29
+ Stefan Kangas
+ Wed Nov 30 16:10:39 2022 +0100
** emacs-29 [100/100]
:PROPERTIES: