local-history-cleanup

# reset HEAD to previous commit, 
# but keep all changes in index and working dir
# to be added and commited 
git reset --soft HEAD~3
#git reset --soft $(git merge-base feature)

git add . 

# add good message and potentially --trailer
# !! new commit !! 
# this also changes the author
# the rebase -i method keeps the original author
git commit

# on current branch, rebase last n commits
git rebase -i HEAD~n

# rebase until common ancestor (a.k.a. the complete feature branch)
git rebase -i $(git merge-base feature main)

git rebase -i main
# potentially edit commit message again (add trailer)

git add ?? && git rebase --continue 

git switch main
git pull

## ff merge
git merge feature
# or
git rebase feature  # feature points to same tip as HEAD and main

# on main (git switch main)
git merge --squash feature  # dangling feature tip

git log  # find sha of (1)

# the ~includes this commit in the rebase editor
git rebase -i commit-sha~

# move commit (3) under commit (1) and choose "fixup"
# !! 
#    resolving can be tricky 
#    should be isolated to feature and not include other commits in (2)
# !!