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

Re: [PATCH v3 5/8] Fold all merge diff variants into an enum

From
Junio C Hamano <gitster@pobox.com>
Date
Sep 8, 2014, 17:36 UTC
Message-ID
<xmqqr3zmnhev.fsf@gitster.dls.corp.google.com>
In-Reply-To
<e95adf985efac162da72ac27220b904659dbb02d.1409860234.git.tr@thomasrast.ch>
Thomas Rast <tr@thomasrast.ch> writes:
Show 9 quoted lines
> The four ways of displaying merge diffs,
>
> * none: no diff
> * -m: against each parent
> * -c: combined
> * --cc: combined-condensed
>
> were encoded in three flag bits in struct rev_info.  Fold them all
> into a single enum field that captures the variants.

Nice. It also has a good side effect to spell "condensed" out, instead of using a shorter "dense", and the end result matches what the command line option calls it ;-).

Previous: Thomas RastNext: Thomas Rast
Message 10 of 18 in “--remerge-diff”
  1. 0/8 --remerge-diffThomas Rast, Sep 6, 2014
  2. 1/8 merge-recursive: remove dead conditional in update_stages()Thomas Rast, Sep 6, 2014
  3. 2/8 merge-recursive: internal flag to avoid touching the worktreeThomas Rast, Sep 6, 2014
  4. Junio C HamanoSep 8, 2014
  5. 3/8 merge-recursive: -Xindex-only to leave worktree unchangedThomas Rast, Sep 6, 2014
  6. 4/8 combine-diff: do not pass revs->dense_combined_merges redundantlyThomas Rast, Sep 6, 2014
  7. Junio C HamanoSep 8, 2014
  8. Jens LehmannSep 11, 2014
  9. 5/8 Fold all merge diff variants into an enumThomas Rast, Sep 6, 2014
  10. Junio C HamanoSep 8, 2014
  11. 6/8 merge-recursive: allow storing conflict hunks in indexThomas Rast, Sep 6, 2014
  12. Junio C HamanoSep 9, 2014
  13. 7/8 name-hash: allow dir hashing even when !ignore_caseThomas Rast, Sep 6, 2014
  14. Junio C HamanoSep 9, 2014
  15. 8/8 log --remerge-diff: show what the conflict resolution changedThomas Rast, Sep 6, 2014
  16. Junio C HamanoSep 8, 2014
  17. Junio C HamanoSep 9, 2014
  18. Junio C HamanoSep 9, 2014

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.