In git how do I delete/drop a specific commit from history (rebase) programmatially?

Question

I know how to interactively modify a git history and drop a specific commit but I didn't find a way to do that fully automatically.

I'd like to identify specific commits (e.g. containing a magic string) and have them deleted by a script.

Something like this:

# identify and remove all commits which would be merged to master but should not
for i in $(git --no-pager log --grep='no-push' --pretty=format:"%h" --no-merges HEAD ^master)
do
    echo "Drop commit $i"
    git rebase --drop $i   # <== this is what I want to do
done

Any ideas?

Have you read e.g. https://stackoverflow.com/a/32318688/3001761? — jonrsharpe, Mar 03 '20 at 08:31

frans · Accepted Answer · 2020-03-03T08:57:42.177

0

Taken from here (thanks to jonrsharpe):

# identify and remove all commits which would be merged to master but should not
for i in $(git --no-pager log --grep='no-push' --pretty=format:"%h" --no-merges HEAD ^master)
do
    echo "Drop commit $i"
    git rebase -p --onto $i^ $i
done

edited Mar 03 '20 at 08:57

answered Mar 03 '20 at 08:41

frans

8,868
11
58
132

totally right and useful - in this case I know I get only git shas without any whitespaces. but feel free to improve the code – frans Mar 04 '20 at 10:14

In git how do I delete/drop a specific commit from history (rebase) programmatially?

1 Answers1