Javascript error with "no-ff" merge

[tomasfejfar]

When I try to show no-ff merge I get (tried both positions):

git merge --no-ff master
Cannot read property 'parent' of null
git merge master --no-ff
Cannot read property 'parent' of null

[kheyse-werk]

What you are trying to do is merge an older commit into a newer commit where the older commit is a direct ancestor of the newer commit. Git would tell you "Already up to date." when you do that.