One of our colleagues did at one point a fast forward (FF) merge and inadvertently FF merged the release branch into the master branch.
I am having a hard time pinpointing exactly when that merge happened (I am using smartgit as well). I looked at git reflog and git log -g but the output doesn't seem to tell me much.
Any suggestions?
In your colleague's repo, you can do git reflog master --date=iso
, and you should see at least one entry that looks like this:
bd7d6aa master@{2015-12-30 00:33:17 +0000}: merge release/foo: Fast-forward