bug-gnu-emacs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: Stefan Monnier
Subject: bug#68929: [PATCH] Copy which-key from GNU ELPA into core
Date: Sun, 04 Feb 2024 22:08:59 -0500
User-agent: Gnus/5.13 (Gnus v5.13)

> 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






reply via email to

[Prev in Thread] Current Thread [Next in Thread]