The new --git-commit option to prepare-ChangeLog added in r23748 doesn't support the --diff option. I have a patch to fix this.
Created attachment 15235 [details] Patch with ChangeLog
Landed as r23778