Hi! On 4/21/23 04:48, наб wrote: > As a pull.rebase = true enjoyer, it was very easy > (indeed, git pull and axe the single-line conflict + empty commit), > and it's what I've been doing the entire time; recommend it. Heh, I never run `git pull`. It feels too dangerous. I prefer `git fetch` and then doing manually whatever needs to be done, so I know exactly what goes on. > > 5/5 remains a toss-up for me. Apply it if you think it's better, > don't if you don't. > > https://bugs.debian.org/1034658 :) > > наб (5): > regex.3: Desoupify regerror() description > regex.3, regex_t.3type, regmatch_t.3type, regoff_t.3type: Move & link > regex_t.3type into regex.3 > regex.3: Finalise move of reg*.3type > regex.3: Destandardeseify Match offsets > regex.3: Further clarify the sole purpose of REG_NOSUB > > man3/regex.3 | 179 +++++++++++++++++++++++--------------- > man3type/regex_t.3type | 64 +------------- > man3type/regmatch_t.3type | 2 +- > man3type/regoff_t.3type | 2 +- > 4 files changed, 110 insertions(+), 137 deletions(-) > > No clue where it got this. The interdiff is just the .IR -> .I. > > Range-diff against v7: > 1: 783a16431 ! 1: 4479e1572 regex.3: Desoupify regerror() description > @@ man3/regex.3: .SS Error reporting > +.IR errbuf ; > +the error string is always null-terminated, and truncated to fit. > .SS Freeing > - Supplying > .BR regfree () > + deinitializes the pattern buffer at This means that the context of the patches changed (due to the rebase), even if the +/- haven't changed themselves. Basically what would be "applying with fuzz" when refreshing a patch. > 2: 5706f1892 < -: --------- regex.3: Desoupify regfree() description > 3: baacf086f < -: --------- regex.3: Improve REG_STARTEND The cause is probably that I applied these before it. Cheers, Alex > 4: 056c3ff04 = 2: bad307847 regex.3, regex_t.3type, regmatch_t.3type, regoff_t.3type: Move & link regex_t.3type into regex.3 > 5: 44d7b775d = 3: edefa8a5e regex.3: Finalise move of reg*.3type > 6: 79641df02 = 4: 500070a5e regex.3: Destandardeseify Match offsets > 7: 26d06c07f = 5: b01685c7a regex.3: Further clarify the sole purpose of REG_NOSUB -- <http://www.alejandro-colomar.es/> GPG key fingerprint: A9348594CE31283A826FBDD8D57633D441E25BB5
Attachment:
OpenPGP_signature
Description: OpenPGP digital signature
