On Sun, Jan 27, 2013 at 6:08 PM, Junio C Hamano <gits...@pobox.com> wrote: > I think our works crossed, while I was tweaking the previous series > to push out as part of 'pu' you were already rerolling. Could you > compare this series with what I pushed out and see if anything you > missed? I think I fixed the (a && b || c && d) issue in the version > I pushed out, but it is still there in this series.
Ah, I see. I can add the addition of preamble for use by show_tool_help() as a follow up along with using a here-doc when printing. The other diff is the Makefile dependencies. I currently have this diff against da/mergetool-docs: diff --git a/Documentation/Makefile b/Documentation/Makefile index f595d26..834ec25 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -202,7 +202,11 @@ install-html: html # # Determine "include::" file references in asciidoc files. # -doc.dep : $(wildcard *.txt) build-docdep.perl +docdep_prereqs = \ + mergetools-list.made $(mergetools_txt) \ + cmd-list.made $(cmds_txt) + +doc.dep : $(docdep_prereqs) $(wildcard *.txt) build-docdep.perl $(QUIET_GEN)$(RM) $@+ $@ && \ $(PERL_PATH) ./build-docdep.perl >$@+ $(QUIET_STDERR) && \ mv $@+ $@ I'll send three follow-up patches. - here-doc, preamble stuff, and Makefile deps, based on what's currently in pu. -- David -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html