> (2) ... In other > words, *users* of git-am are not supposed to figure it out. > They will not find *their* project policy from git > documentation, unless their project happens to be the git > project. But if they don't use the same formatting as git policy requires, git-am will produce a mess of a log, until they discover the only policy that works with git-am by word of mouth. Specifically, as far as a *user* is concerned: 1. the fact that "---" separates commit message from patch, and that text after "---" is ignored seems to be undocumented 2. the fact that message subject is appended to the log, the rules for removing [PATCH] etc from subject seem to be undocumented 3. if I want to have some text coming *before* the commit message ignored, there's no way to do this 4. there's no way to override the subject from within the message (like there is with author/From line) > (3) However, we are discussing your patch to support "git merge > FETCH_HEAD" better, which I took as your contribution to the > git project. I asked you to follow the project policy for > your contribution, and pointed at the document that > describes the policy. Amen to that, sorry about the formatting. > To reiterate the more important points (this is also for my own > purpose because I do not want the patch lost in this noise we > are making): > > - Checking readability of $GIT_DIR/$remote itself is too loose; > the name FETCH_HEAD should explicitly be checked, as that is > the file that has the specific format that is understood by > fmt-merge-msg. > > - "echo -n" is to be avoided for portability. > > - "git fetch $URL foo bar" would leave two lines in FETCH_HEAD; > subsequent "git merge FETCH_HEAD" would merge only foo. Pick > the first line, stripping out not-for-merge marker and let it > processed by fmt-merge-msg. Thanks, I'll try to address these. -- MST - 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