GNU bug report logs - #68929
[PATCH] Copy which-key from GNU ELPA into core

Previous Next

Package: emacs;

Reported by: Jeremy Bryant <jb <at> jeremybryant.net>

Date: Sun, 4 Feb 2024 22:06:02 UTC

Severity: normal

Tags: patch

Done: Eli Zaretskii <eliz <at> gnu.org>

Bug is archived. No further changes may be made.

Full log

View this message in rfc822 format

From: Stefan Monnier <monnier <at> iro.umontreal.ca>
To: Justin Burkett <justin <at> burkett.cc>
Cc: jb <at> jeremybryant.net, 68929 <at> debbugs.gnu.org
Subject: bug#68929: [PATCH] Copy which-key from GNU ELPA into core
Date: Sun, 04 Feb 2024 22:08:59 -0500

> I can take care of this tomorrow, but otherwise feel free to make the move
> yourselves.

BTW, rather than adding a file, another way to add it to `emacs.git` is
by `git merge --allow-unrelated-histories`.
If you wan to do that, you'll want to first create a new commit which
moves the files to their "final" destination, like:

    git rm .gitignore .github Makefile LICENSE.md ...
    git mv which-key.el lisp/which-key.el
    git mv which-key-tests.el test/lisp/which-key-tests.el
    [ not sure what you plan to do with the README.org and image files. ]
    git commit -m 'Move files in preparation for merge into emacs.git'

and then you can `git merge` that new commit into Emacs, preserving
the history.


        Stefan
This bug report was last modified 1 year and 49 days ago.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.