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

Re: [PATCH v6 0/3] rr/fmt-merge-msg replacement

From
Junio C Hamano <gitster@pobox.com>
Date
Aug 25, 2010, 20:43 UTC
Message-ID
<7vhbiiqv8p.fsf@alter.siamese.dyndns.org>
In-Reply-To
<1282733330-32334-1-git-send-email-artagnon@gmail.com>
Ramkumar Ramachandra <artagnon@gmail.com> writes:
> This is a replacement for rr/fmt-merge-msg. It corrects the problems
> pointed out by Jonathan and adds one extra patch. Additionally, I've
> rebased it so there's no merge conflict when you merge it into `pu`
> (see: jn/merge-renormalize). 4/5 from v5 has been dropped.
Thanks,

Just as a future reference, in a case like this that results in trivial conflict, I'd prefer to see a patch that can be used independently from other unrelated branches.

Maybe you'd want a new test or two in t6200?
Previous: Ramkumar RamachandraNext: Ramkumar Ramachandra
Message 5 of 7 in “rr/fmt-merge-msg replacement”
  1. 0/3 rr/fmt-merge-msg replacementRamkumar Ramachandra, Aug 25, 2010
  2. 1/3 fmt_merge_msg: Change fmt_merge_msg API to accept shortlog_lenRamkumar Ramachandra, Aug 25, 2010
  3. 2/3 merge: Make '--log' an integer option for number of shortlog entriesRamkumar Ramachandra, Aug 25, 2010
  4. 3/3 merge: Make 'merge.log' an integer or boolean optionRamkumar Ramachandra, Aug 25, 2010
  5. Junio C HamanoAug 25, 2010
  6. Ramkumar RamachandraAug 26, 2010
  7. Junio C HamanoAug 26, 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.