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

Re: Warning about conflict markers - undocumented 'diff --check' feature & suggestion

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 29, 2016, 18:23 UTC
Message-ID
<xmqqvb45xhw1.fsf@gitster.mtv.corp.google.com>
In-Reply-To
<CALgdb5+E7_CT2e9WFBd9GhiFuc_B7+bpC9tjDfR+-QiTGeoP+A@mail.gmail.com>
Ori Avtalion <ori@avtalion.name> writes:
> If my change introduces a few words that exceed asciidoc's ~72-char line width,
> should I reformat the entire paragraph? (thus making it had to identify what
> changed exactly)
You should try to minimize the damage, but shouldn't go overboard ;-)
> Any thoughts on adding similar functionality to "git add"?
I am not sure what "similar functionality" you are imagining.

"git add" does not show any changes, it just does what it was told to do. If the user is unsure, s/he should make it the habit to check what s/he is doing with "git diff".

Previous: Ori AvtalionNext: Ori Avtalion
Message 4 of 6 in “Warning about conflict markers - undocumented 'diff --check' feature & suggestion”
  1. Ori AvtalionMar 28, 2016
  2. Junio C HamanoMar 28, 2016
  3. Ori AvtalionMar 29, 2016
  4. Junio C HamanoMar 29, 2016
  5. Ori AvtalionMar 29, 2016
  6. Documentation: git diff --check detects conflict markersOri Avtalion, Mar 29, 2016

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.