git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v5 3/5] merge: Make 'merge.log' an integer or boolean option

From
Ramkumar Ramachandra <artagnon@gmail.com>
Date
Aug 25, 2010, 03:52 UTC
Message-ID
<20100825035228.GA3280@kytes>
In-Reply-To
<7vmxsbu963.fsf@alter.siamese.dyndns.org>
Hi Junio,
Junio C Hamano writes:
> This makes sense, but I agree with Jonathan's reviews on 1/5 and 2/5, I'll
> ask you to reroll this on top of what I'll push out shortly.

Thanks! I'll rebase on top of rr/fmt-merge-msg in `pu` and re-roll later today.

Show 5 quoted lines
> As to 4/5, I think we should proceed a lot more carefully than what your
> patch does, just like we were extra careful when we went to v1.7.0 than
> when we went to v1.6.0 (see release notes to 1.6.6 for a summary,
> especially paying attention to the third and the fourth paragraph in
> "Preparing yourselves" section).
Ok, I'll look at this and fix the patch accordingly.
> I've queued 5/5 directly on maint.
Right, I saw that.
-- Ram
Previous: Junio C HamanoNext: Ramkumar Ramachandra
Message 11 of 13 in “merge --log configurability”
  1. 0/5 merge --log configurabilityRamkumar Ramachandra, Aug 22, 2010
  2. 1/5 fmt_merge_msg: Change fmt_merge_msg API to accept shortlog_lenRamkumar Ramachandra, Aug 22, 2010
  3. Jonathan NiederAug 23, 2010
  4. Junio C HamanoAug 24, 2010
  5. merge, fmt_merge_msg --log: default value is DEFAULT_MERGE_LOG_LENJonathan Nieder, Aug 25, 2010
  6. 2/5 merge: Make '--log' an integer option for number of shortlog entriesRamkumar Ramachandra, Aug 22, 2010
  7. Jonathan NiederAug 23, 2010
  8. Ramkumar RamachandraAug 25, 2010
  9. 3/5 merge: Make 'merge.log' an integer or boolean optionRamkumar Ramachandra, Aug 22, 2010
  10. Junio C HamanoAug 24, 2010
  11. Ramkumar RamachandraAug 25, 2010
  12. 4/5 fmt-merge-msg: Remove deprecated '--summary' optionRamkumar Ramachandra, Aug 22, 2010
  13. 5/5 parse-options: clarify PARSE_OPT_NOARG descriptionRamkumar Ramachandra, Aug 22, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.