30 Apr
2012
30 Apr
'12
1:35 p.m.
Dear Gabriel Huau,
In message 20120430110724.GB4656@debian you wrote:
Just a little question about the ChangeLog. I added the "---" and my changements after it, but I see this part in "git log", is it normal ? Will this part be deleted in the merge ?
You should never see this in a git log.
The "---" separator line gets automatically inserted by "git format-patch"; you add your comments manually after creating the patch by inserting them below this line. "git am" will then ignore this line and everything below it.
So if you can see this as part of the commit message, something went wrong.
Best regards,
Wolfgang Denk
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd@denx.de
Punishment becomes ineffective after a certain point. Men become in-
sensitive.
-- Eneg, "Patterns of Force", stardate 2534.7