Merge branch 'mk/blame-error-message' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 3 Nov 2015 23:32:42 +0000 (15:32 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 3 Nov 2015 23:32:43 +0000 (15:32 -0800)
commitfdca2bed90a7991f2a3afc6a463e45acb03487ac
tree85db6e546bb25cf94b19377f0953d1d2d02ee669
parent5c15ca0b3c866398f22cbab974d0a1964ef105ca
parent95261974bbc8cc1a32ed260f06a694cde86f732d
Merge branch 'mk/blame-error-message' into maint

The error message from "git blame --contents --reverse" incorrectly
talked about "--contents --children".

* mk/blame-error-message:
  blame: fix option name in error message
builtin/blame.c