Ignoring backup files from programs such as Winmerge.
Restoring edits from an earlier commit that were accidentally overwritten by the previous commit.