
11 Nov
2014
11 Nov
'14
12:16 p.m.
Vladimir Prus
Did you use --no-ff option, so the a merge commit is created as opposed to 'master' just changed to point to a different commit id?
I use the default setting of TortoiseGit, which has "No Fast Forward" unchecked. I don't remeber ever changing this (but might be wrong), and this weird behavior has only come up recently. Joaquín M López Muñoz Telefónica