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

Re: Side-by-side diff and patch visualization

From
David Kastrup <dak@gnu.org>
Date
Sep 19, 2007, 12:23 UTC
Message-ID
<86y7f22695.fsf@lola.quinscape.zz>
In-Reply-To
<A92611E8-1035-46A6-AFEF-9C8A6F93AFB1@wincent.com>
Wincent Colaiuta <win@wincent.com> writes:
Show 5 quoted lines
> Does anybody know of any tools for doing side-by-side visualizations
> of diffs and patches which work well with Git?
>
> So, can anyone recommend a tool which can do this kind of side-by- 
> side visualization and plays nicely with Git?

I use M-x ediff-revision RET in Emacs for this. There is also M-x smerge-ediff RET for resolving a file with merge conflict markers, and M-x ediff-merge-revisions-with-ancestor RET.

The side-by-side layout is chosen by typing | into the control window for the merge.

Looking at a patch in respect of two versions can be done with M-x ediff-patch-file RET.

-- 
David Kastrup
Previous: Andy Parkins
Message 5 of 5 in “Side-by-side diff and patch visualization”
  1. Wincent ColaiutaSep 19, 2007
  2. Jeff KingSep 19, 2007
  3. Wincent ColaiutaSep 19, 2007
  4. Andy ParkinsSep 19, 2007
  5. David KastrupSep 19, 2007

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.