Another git question

[Ethan A M. <sf...@us...>]

Here's part of the problem I'm having with tracking ChangeLog in git.

Suppose that a git format-patch file contains a ChangeLog entry that is
supposed to go at the top of the current ChangeLog file.  Like this:

diff --git a/ChangeLog b/ChangeLog
index 9ca7eee..285597c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -0,0 +1,4 @@
+2017-11-17  Ethan A Merritt  <merritt@u.washington.edu>
+
+	git does not like this diff format
+


The entire patch file containing this piece is rejected by "git apply"
or "git am", apparently because it does not like the syntax "@@ -0,0"
which diff/patch use to indicate "top of file".

I can apply the patch manually using "patch" and then run "git commit",
but this loses the commit message and author information that was in
the original formatted patch.

Is there some config option for "git am" and/or "git apply" that tells
it to accept this syntax in a patch file?

Note: "patch" will also accept "@@ -1,0" rather than "@@ -0,0" but
git doesn't like this form either.

	Ethan