aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--orgmode-backports.org23
1 files changed, 14 insertions, 9 deletions
diff --git a/orgmode-backports.org b/orgmode-backports.org
index a10a762..a38f51c 100644
--- a/orgmode-backports.org
+++ b/orgmode-backports.org
@@ -14,33 +14,38 @@ format
author
author date
+The ~org-maint-insert-emacs-commit-info~ command in org-maint.el can
+be used to insert the original commit message plus the above block of
+information.
+
Note that, as [[https://orgmode.org/list/87d19h8sr5.fsf@kyleam.com][discussed on the list]], "backport" isn't really the best
term for this, but it probably makes sense to continue using it in the
commit messages at this point.
* Commands
-** Format patch
+org-maint.el defines the following commands
-: git format-patch -oorg-patches <commit>^..<commit> -- lisp/org
+- ~org-maint-check-for-new~
-** Apply in Org repo with
+ Check for new commits from Emacs to port to the Org repo.
-: git apply -p3 --directory=lisp/ <patch>
+ This should be called with point at the top of a subheading of
+ "Backport list" (e.g., the [[*master branch][master branch]] heading).
-~git am~ can be used with the same arguments.
+- ~org-maint-apply-emacs-commit~
-** Format for commit information
+ Apply an Emacs commit to the Org repo.
-: git show -s --format="%H%n%s%n%an%n%cd" <commit>
+- ~org-maint-insert-emacs-commit-info~
** Applying failed patch
-When 'git am' fails, the patch can be partially applied with
+When ~git am~ fails, the patch can be partially applied with
: git apply --directory=lisp/ --reject -p3 .git/rebase-apply/0001
-and then after resolving run
+After resolving the conflict, run
: git am --continue