[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: add filename to tag for catchfilebetweentags
From: |
Uwe Brauer |
Subject: |
Re: add filename to tag for catchfilebetweentags |
Date: |
Fri, 16 Dec 2022 17:56:53 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) |
> Hm this is what Tassilo told me, well a couple of years ago, so maybe this
> has changed.
-> git am --patch-format=hg catchfilebetweentags-filename.patch
> that is strange,
> Ok, fortunately I have now a relative recent git
> version install (2.38.1) this should work flawlessly otherwise I have to
> file a but to the hg maintainers. I will test it myself, not sure how
> git works whether I have later to strip or to stash the applied patch.
> Anyway I figure out, if not I follow this great advice 😉
Here is what I did (and it worked)
git pull
git checkout master (just in case)
I generated the patch again (you find it attached below)
I run whitespace-cleanup
I run
git am --patch-format=hg ../catchfilebetweentags.patch
Applying: Add filename as a prefix to the counter for catchfilebetweentags
Git log now gives me
* commit 8e42d3c5bf7cdf660b9d77b6da6ecf41af4e09f9 (master) (HEAD -> master)
| Author: Uwe Brauer <oub@mat.ucm.es>
|
| Add filename as a prefix to the counter for catchfilebetweentags
| * style/catchfilebetweentags.el:
| Add filename as a prefix to the counter for catchfilebetweentags
|
* commit 288665587a4fcb6b7fc356e86a86ee9670186232 (remotes/svannah/HEAD)
(svannah/master, svannah/HEAD)
| Author: Ikumi Keita <ikumi@ikumi.que.jp>
|
| Use `symbol-value' instead of `eval'
|
* commit 3806176ba2fa11cc990e49792f9db34532c85258 (remotes/svannah/HEAD~1)
| Author: Ikumi Keita <ikumi@ikumi.que.jp>
|
| Fix argument description in doc strings
|
* commit 22fa670915fb1fb6a08b60c7bb5acfb79684dd55 (remotes/svannah/HEAD~2)
| Author: Ikumi Keita <ikumi@ikumi.que.jp>
|
| ; Fix doc strings
|
I think I should now run
git reset --hard 8e42d3c5bf7cdf660b
Right?
Uwe
--
Warning: Content may be disturbing to some audiences
I strongly condemn Putin's war of aggression against the Ukraine.
I support to deliver weapons to Ukraine's military.
I support the ban of Russia from SWIFT.
I support the EU membership of the Ukraine.
https://addons.thunderbird.net/en-US/thunderbird/addon/gmail-conversation-view/
catchfilebetweentags.patch
Description: Text Data
smime.p7s
Description: S/MIME cryptographic signature
- Re: add filename to tag for catchfilebetweentags, Arash Esbati, 2022/12/13
- Re: add filename to tag for catchfilebetweentags, Uwe Brauer, 2022/12/13
- Re: add filename to tag for catchfilebetweentags, Uwe Brauer, 2022/12/14
- Re: add filename to tag for catchfilebetweentags, Arash Esbati, 2022/12/16
- Re: add filename to tag for catchfilebetweentags, Uwe Brauer, 2022/12/16
- Re: add filename to tag for catchfilebetweentags,
Uwe Brauer <=
- Re: add filename to tag for catchfilebetweentags, Arash Esbati, 2022/12/19
- Re: add filename to tag for catchfilebetweentags, Uwe Brauer, 2022/12/19
- Re: add filename to tag for catchfilebetweentags, Arash Esbati, 2022/12/19
- Re: add filename to tag for catchfilebetweentags, Uwe Brauer, 2022/12/19
- Re: add filename to tag for catchfilebetweentags, Uwe Brauer, 2022/12/19
- Re: add filename to tag for catchfilebetweentags, Arash Esbati, 2022/12/19
- Re: add filename to tag for catchfilebetweentags, Uwe Brauer, 2022/12/19