On Nov 9, 2007, at 3:18 PM, Johannes Schindelin wrote:
Hi,
On Fri, 9 Nov 2007, Steffen Prohaska wrote:
On Nov 9, 2007, at 2:51 AM, Junio C Hamano wrote:
Junio C Hamano <gitster@xxxxxxxxx> writes:
That's a known design limitation of applymbox/mailinfo. Any
line that looks like a beginning of a patch in e-mail ("^--- ",
"^---$", "^diff -", and "^Index: ") terminates the commit log.
Ok, so that explains the symptom. What's the next step?
* The applymbox/mailinfo pair should continue to split the
commit log message at the first such line. There is no point
breaking established workflow, and people in communities that
exchange patches via e-mail already know to avoid this issue
by indenting quoted diff snippet in the log message,
e.g. 5be507fc.
I wasn't aware of this.
But there's a really easy workaround: use --merge with git rebase.
It's no longer a problem for me. I now know the limitation and
the work around. But others could get bitten, too. We could
save them.
Steffen
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
