From: Mark Jamsek Subject: Re: got histedit -d (drop all commits) To: Omar Polo Cc: Stefan Sperling , Game of Trees Date: Tue, 31 Jan 2023 22:31:32 +1100 On 23-01-30 04:09PM, Omar Polo wrote: > On 2023/01/30 15:19:09 +0100, Stefan Sperling wrote: > > On Tue, Jan 31, 2023 at 12:16:26AM +1100, Mark Jamsek wrote: > > > As discussed on irc, the below diff introduces the histedit -d flag, > > > which is like -f but drops all commits. Regress has also been added for > > > the new flag. > > > > > > While writing this, I noticed we missed a conflict check for -f and -e, > > > which is included in the diff, but I should probably send as a separate > > > commit. > > > > > > diffstat /home/mark/src/got > > > M got/got.1 | 9+ 1- > > > M got/got.c | 41+ 11- > > > M regress/cmdline/histedit.sh | 117+ 0- > > > > > > 3 files changed, 167 insertions(+), 12 deletions(-) > > > > Nice, ok by me. > > +1 for me too Sorry, op, I'm not sure if I missed this last night before committing! > > One can already use 'got ref' or 'got branch' to achieve a similar effect. > > But it is a good idea to make this functionality easy to discover and use > > with the histedit command. > > and it's also a bit safer than overriding refs :) > -- Mark Jamsek GPG: F2FF 13DE 6A06 C471 CA80 E6E2 2930 DC66 86EE CF68