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

How to combine multiple commit diffs?

From
ZheNing Hu <adlternative@gmail.com>
Date
Oct 12, 2023, 12:00 UTC
Message-ID
<CAOLTT8RzcENBx9NKffHReVKJAho89TCO7W2SPBX8sb2tEU84Gw@mail.gmail.com>
Hi everyone,

Our company wants to design a "small-batch" code review feature. Simply put, this "small-batch" means being able to treat multiple related commits within a MergeRequest as an independent "small" code review.

Let me give you an example: We have five commits: A1, B, A2, C, A3. Among them, A1, A2, and A3 are multiple commits for the same feature. So when the user selects these commits, the page will return a "combine diff" that combines them together.

A1       B A2 A3 C
*--------*----*-----*-------* (branch)
 \ A1'        \ A2'  \ A3'
  *------------*------*------- (small branch code review)

This may seem similar to cherry-picking a few commits from a pile of commits, but in fact, we do not expect to actually perform cherry-picking.

Do you have any suggestions on how we can merge a few commits together and display the diff? The only reference we have is the non-open source platform, JetBrains Space CodeReview, they support selecting multiple commits for CodeReview. [1], .

[1]: https://www.jetbrains.com/help/space/review-code.html#code-review-example

Thanks, -- ZheNing Hu

Next: Junio C Hamano
Message 1 of 5 in “How to combine multiple commit diffs?”
  1. ZheNing HuOct 12, 2023
  2. Junio C HamanoOct 12, 2023
  3. ZheNing HuOct 18, 2023
  4. Johannes SixtOct 12, 2023
  5. ZheNing HuOct 18, 2023

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.