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

[PATCH 0/2] improve combined diff documentation

From
Adam Monsen <haircut@gmail.com>
Date
Mar 5, 2011, 19:56 UTC
Message-ID
<1299355004-3532-1-git-send-email-haircut@gmail.com>
In-Reply-To
<4D724A0F.7050904@gmail.com>

The "combined diff format" documentation in diff-generate-patch.txt incorrectly implied that "log -p" shows conflict resolutions as combined diffs.

With these small documentation fixes I'm hoping to save someone the time it took me to figure out how a merge conflict was resolved.

Related thread:
http://thread.gmane.org/gmane.comp.version-control.git/168481
The patches apply cleanly to maint.

Hope this helps, -Adam ("meonkeys" on IRC)

Adam Monsen (2):
  documentation fix: git log -p does not imply -c.
  English grammar fixes for combined diff doc.
 Documentation/diff-generate-patch.txt |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)
-- 
1.7.2.3
Previous: Adam MonsenNext: Adam Monsen
Message 7 of 26 in “frustrated forensics: hard to find diff that undid a fix”
  1. Adam MonsenMar 5, 2011
  2. Jonathan del StrotherMar 5, 2011
  3. Jakub NarebskiMar 5, 2011
  4. Jonathan NiederMar 5, 2011
  5. Jeff KingMar 5, 2011
  6. Adam MonsenMar 5, 2011
  7. 0/2 improve combined diff documentationAdam Monsen, Mar 5, 2011
  8. 1/2 documentation fix: git log -p does not imply -c.Adam Monsen, Mar 5, 2011
  9. Junio C HamanoMar 7, 2011
  10. Jeff KingMar 7, 2011
  11. Junio C HamanoMar 7, 2011
  12. Jeff KingMar 7, 2011
  13. Documentation fix: git log -p does not imply -c.Adam Monsen, Mar 7, 2011
  14. Junio C HamanoMar 8, 2011
  15. Documentation fix: git log -p does not imply -c.Adam Monsen, Mar 8, 2011
  16. Junio C HamanoMar 8, 2011
  17. Adam MonsenMar 8, 2011
  18. Junio C HamanoMar 9, 2011
  19. Adam MonsenMar 9, 2011
  20. SubmittingPatches: clean up commit message tipsAdam Monsen, Mar 9, 2011
  21. Junio C HamanoMar 9, 2011
  22. diff format documentation: clarify --cc and -cAdam Monsen, Mar 8, 2011
  23. diff format documentation: clarify --cc and -cAdam Monsen, Mar 8, 2011
  24. Jeff KingMar 8, 2011
  25. 2/2 English grammar fixes for combined diff doc.Adam Monsen, Mar 5, 2011
  26. Martin von ZweigbergkMar 5, 2011

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.