dolt icon indicating copy to clipboard operation
dolt copied to clipboard

Support `dolt rebase`

Open mitar opened this issue 2 years ago • 5 comments

I am exploring dolt but I am observing one feature missing: how to redact data already committed? How to change an existing commit to remove sensitive data which has been by accident pushed to it? Another problem is if you get GDPR "remove my data" request. Is there any plan to add that?

Also, if this would be added, my understanding is that also commit hashes of later commits would change, same as in git, yes?

Similarly, there is no --amend to commit.

mitar avatar May 21 '22 21:05 mitar

We currently support this through dolt filter-branch, here are the docs https://docs.dolthub.com/reference/cli#dolt-filter-branch

andy-wm-arthur avatar May 22 '22 05:05 andy-wm-arthur

Interesting. Does this work also for documentation files? And just to be sure, this changes commit hashes after rewriting, yes?

mitar avatar May 22 '22 07:05 mitar

Filter branch works on table data only, and yes, it rewrites each commit and creates a new commit

andy-wm-arthur avatar May 23 '22 16:05 andy-wm-arthur

Does filter-branch allow for squashing past commits?

aleclarson avatar Jun 08 '22 15:06 aleclarson

No, filter-branch gives you a commit history 1:1 with the original one. There's no squash functionality.

True rebase functionality is coming, but is currently unscheduled. If this is stopping you from adopting dolt, please let us know.

zachmu avatar Jun 08 '22 17:06 zachmu

@fulghum is working on this now.

timsehn avatar Nov 03 '23 18:11 timsehn

As of Dolt 1.30.5, we now support interactive rebases through the SQL interface.

See our announcement blog post for more details and let us know if you'd like to see additional rebase features supported.

fulghum avatar Jan 03 '24 23:01 fulghum