Google Git
Sign in
googlers / jrn / git / 90110d7645e5035ea59bc5c72fac4e11ad55a6ef / notes-merge.c
  1. 5de89d3 Merge branch 'jc/show-sig' by Junio C Hamano · 13 years ago
  2. f35ccd9 Merge branch 'nd/war-on-nul-in-commit' by Junio C Hamano · 13 years ago
  3. 13f8b72 Convert commit_tree() to take strbuf as message by Nguyễn Thái Ngọc Duy · 13 years ago
  4. b7f7c07 Merge branch 'nd/resolve-ref' by Junio C Hamano · 13 years ago
  5. 4c00c85 Sync with 1.7.7.4 by Junio C Hamano · 13 years ago
  6. 01e0f16 Merge branch 'jn/maint-notes-avoid-va-args' into maint by Junio C Hamano · 13 years ago
  7. 5f9f8d1 notes merge: eliminate OUTPUT macro by Jonathan Nieder · 13 years ago
  8. c689332 Convert many resolve_ref() calls to read_ref*() and ref_exists() by Nguyễn Thái Ngọc Duy · 13 years ago
  9. ba3c69a commit: teach --gpg-sign option by Junio C Hamano · 13 years ago
  10. e579a5d Merge branch 'mh/maint-notes-merge-pathbuf-fix' by Junio C Hamano · 13 years ago
  11. 8d9c501 Change check_ref_format() to take a flags argument by Michael Haggerty · 13 years ago
  12. 8528445 notes_merge_commit(): do not pass temporary buffer to other function by Michael Haggerty · 13 years ago
  13. c4ce46f index_fd(): turn write_object and format_check arguments into one flag by Junio C Hamano · 14 years ago
  14. c2e86ad Fix sparse warnings by Stephen Boyd · 14 years ago
  15. dab0d41 correct type of EMPTY_TREE_SHA1_BIN by Jonathan Nieder · 14 years ago
  16. a6a0909 git notes merge: Add another auto-resolving strategy: "cat_sort_uniq" by Johan Herland · 14 years ago
  17. 443259c git notes merge: List conflicting notes in notes merge commit message by Johan Herland · 14 years ago
  18. 6abb365 git notes merge: Manual conflict resolution, part 2/2 by Johan Herland · 14 years ago
  19. 809f38c git notes merge: Manual conflict resolution, part 1/2 by Johan Herland · 14 years ago
  20. 3228e67 git notes merge: Add automatic conflict resolvers (ours, theirs, union) by Johan Herland · 14 years ago
  21. 2085b16 git notes merge: Handle real, non-conflicting notes merges by Johan Herland · 14 years ago
  22. 5688184 builtin/notes.c: Refactor creation of notes commits. by Johan Herland · 14 years ago
  23. 75ef3f4 git notes merge: Initial implementation handling trivial merges only by Johan Herland · 14 years ago