By using the command

git commit --fixup=[commitId] ...

stash could be enabled to recognize fixup commits to offer one or both of these options:

• decline merges , s.t. the user can fix it up manually
• before merge

  rebase -autosquash