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

Re: [PATCH] Docs: Add some missing options to git-diff.txt

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 30, 2017, 20:18 UTC
Message-ID
<xmqqinmq34d3.fsf@gitster.mtv.corp.google.com>
In-Reply-To
<1490903375-2115-1-git-send-email-asheiduk@gmail.com>
Andreas Heiduk <asheiduk@gmail.com> writes:
> git-diff understands "--ours", "--theirs" and "--base" for files with
> conflicts. But so far they were not documented for the central diff
> command but only for diff-files.

This is probably a shared issue with the original text for "diff-files", but I think we must stress that these options make sense only when you are in the middle of conflict resolution.

In addition, unlike "diff-files", if these were to appear in the general "git diff" documentation, it also must stress that these options are only about comparing the index and the working tree files, e.g. "git diff --ours HEAD^ HEAD" does not make sense.

Previous: Andreas HeidukNext: Andreas Heiduk
Message 2 of 4 in “Docs: Add some missing options to git-diff.txt”
  1. Docs: Add some missing options to git-diff.txtAndreas Heiduk, Mar 30, 2017
  2. Junio C HamanoMar 30, 2017
  3. Docs: Add some missing options to git-diff.txtAndreas Heiduk, Apr 11, 2017
  4. Docs: Add some missing options to git-diff.txtAndreas Heiduk, Apr 10, 2017

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.