[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: |
Mon, 19 Dec 2022 17:37:16 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) |
>>> "AE" == Arash Esbati <arash@gnu.org> writes:
> Uwe Brauer <oub@mat.ucm.es> writes:
>> 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
> Yes, because the patch you've installed is different from what you sent
> in this message:
> https://lists.gnu.org/archive/html/auctex-devel/2022-12/msg00046.html
>> * 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
> ^
> Note that you have an extra space there.
I am confused, but isn't this precisely what is needed, it looks much
clearer to me than
* style/catchfilebetweentags.el:
Add filename as a prefix to the counter for catchfilebetweentags
Or even
* style/catchfilebetweentags.el:
Add filename as a prefix to the counter for catchfilebetweentags
>> I think I should now run
>>
>> git reset --hard 8e42d3c5bf7cdf660b
>>
>> Right?
> I think so. But be aware that "Any untracked files or directories in
> the way of writing any tracked files are simply deleted."
> You should use branches for this kind of things and then use
> git format-patch
Git is so confusing to me that I prefer everything in mercurial and use
git as a sandbox, if something breaks I delete the git repo and clone
again, as in the xkcd comics 😇
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, 2022/12/16
- Re: add filename to tag for catchfilebetweentags, Arash Esbati, 2022/12/19
- 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, 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