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

Re: [PATCHv3 04/21] notes.c: Reorder functions in preparation for next commit

From
Junio C Hamano <gitster@pobox.com>
Date
Oct 13, 2010, 21:59 UTC
Message-ID
<7vy6a1hhya.fsf@alter.siamese.dyndns.org>
In-Reply-To
<1286586528-3473-5-git-send-email-johan@herland.net>
Hmm, why doesn't this patch apply?  What is this series based on?
Previous: Johan HerlandNext: Jonathan Nieder
Message 6 of 25 in “[PATCHv3 00/21] git notes merge”
  1. Johan HerlandOct 9, 2010
  2. 01/21 notes.c: Hexify SHA1 in die() message from init_notes()Johan Herland, Oct 9, 2010
  3. 02/21 (trivial) notes.h: Minor documentation fixes to copy_notes()Johan Herland, Oct 9, 2010
  4. 03/21 notes.h: Make default_notes_ref() available in notes APIJohan Herland, Oct 9, 2010
  5. 04/21 notes.c: Reorder functions in preparation for next commitJohan Herland, Oct 9, 2010
  6. Junio C HamanoOct 13, 2010
  7. Jonathan NiederOct 13, 2010
  8. 05/21 notes.h/c: Clarify the handling of notes objects that are == null_sha1Johan Herland, Oct 9, 2010
  9. 06/21 notes.h/c: Propagate combine_notes_fn return value to add_note() and beyondJohan Herland, Oct 9, 2010
  10. 07/21 (trivial) t3303: Indent with tabs instead of spaces for consistencyJohan Herland, Oct 9, 2010
  11. 08/21 notes.c: Use two newlines (instead of one) when concatenating notesJohan Herland, Oct 9, 2010
  12. 09/21 builtin/notes.c: Split notes ref DWIMmery into a separate functionJohan Herland, Oct 9, 2010
  13. 10/21 git notes merge: Initial implementation handling trivial merges onlyJohan Herland, Oct 9, 2010
  14. 11/21 builtin/notes.c: Refactor creation of notes commits.Johan Herland, Oct 9, 2010
  15. 12/21 git notes merge: Handle real, non-conflicting notes mergesJohan Herland, Oct 9, 2010
  16. 13/21 git notes merge: Add automatic conflict resolvers (ours, theirs, union)Johan Herland, Oct 9, 2010
  17. 14/21 Documentation: Preliminary docs on 'git notes merge'Johan Herland, Oct 9, 2010
  18. 15/21 git notes merge: Manual conflict resolution, part 1/2Johan Herland, Oct 9, 2010
  19. 16/21 git notes merge: Manual conflict resolution, part 2/2Johan Herland, Oct 9, 2010
  20. 17/21 git notes merge: List conflicting notes in notes merge commit messageJohan Herland, Oct 9, 2010
  21. 18/21 git notes merge: --commit should fail if underlying notes ref has movedJohan Herland, Oct 9, 2010
  22. 19/21 git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"Johan Herland, Oct 9, 2010
  23. 20/21 git notes merge: Add testcases for merging notes trees at different fanoutsJohan Herland, Oct 9, 2010
  24. 21/21 Provide 'git notes get-ref' to easily retrieve current notes refJohan Herland, Oct 9, 2010
  25. Sverre RabbelierOct 9, 2010

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.