complete stab in the dark here, but perhaps however you're getting your work onto master is rewriting timestamps (NFI if the graph goes off authored or commited dates).
Maybe try 'git checkout master && git merge --no-ff feature-branch' and see if that helps
Maybe try 'git checkout master && git merge --no-ff feature-branch' and see if that helps