37 Commits (11c6659d85d72273a4161c8779123147b52fbcb2)

Author SHA1 Message Date
Junio C Hamano 2ce406ccb8 get_merge_bases(): always clean-up object flags 10 years ago
Ronnie Sahlberg 7695d118e5 refs.c: change resolve_ref_unsafe reading argument to be a flags field 10 years ago
Jeff King 8597ea3afe commit: record buffer length in cache 11 years ago
Jeff King bc6b8fc130 use get_commit_buffer everywhere 11 years ago
Jeff King e6dfcd6767 replace dangerous uses of strbuf_attach 11 years ago
Jeff King 3ffefb54c0 commit_tree: take a pointer/len pair rather than a const strbuf 11 years ago
Nguyễn Thái Ngọc Duy bd1928df1d remove diff_tree_{setup,release}_paths 12 years ago
Johan Herland bf9a05ba46 Move create_notes_commit() from notes-merge.c into notes-utils.c 12 years ago
Thomas Rast 28452655af diff_setup_done(): return void 13 years ago
Nguyễn Thái Ngọc Duy 2ca0c53b31 notes-merge: remove i18n legos in merge result message 13 years ago
Johan Herland dabba590aa notes-merge: Don't remove .git/NOTES_MERGE_WORKTREE; it may be the user's cwd 13 years ago
Johan Herland a0be62c100 notes-merge: use opendir/readdir instead of using read_directory() 13 years ago
Nguyễn Thái Ngọc Duy 13f8b72d8c Convert commit_tree() to take strbuf as message 13 years ago
Jonathan Nieder 5f9f8d15f1 notes merge: eliminate OUTPUT macro 13 years ago
Nguyễn Thái Ngọc Duy c689332391 Convert many resolve_ref() calls to read_ref*() and ref_exists() 13 years ago
Junio C Hamano ba3c69a9ee commit: teach --gpg-sign option 13 years ago
Michael Haggerty 8d9c50105f Change check_ref_format() to take a flags argument 13 years ago
Michael Haggerty 852844561e notes_merge_commit(): do not pass temporary buffer to other function 13 years ago
Junio C Hamano c4ce46fc7a index_fd(): turn write_object and format_check arguments into one flag 14 years ago
Stephen Boyd c2e86addb8 Fix sparse warnings 14 years ago
Jonathan Nieder dab0d4108d correct type of EMPTY_TREE_SHA1_BIN 14 years ago
Johan Herland a6a09095a0 git notes merge: Add another auto-resolving strategy: "cat_sort_uniq" 14 years ago
Johan Herland 443259cf92 git notes merge: List conflicting notes in notes merge commit message 14 years ago
Johan Herland 6abb3655ef git notes merge: Manual conflict resolution, part 2/2 14 years ago
Johan Herland 809f38c8ab git notes merge: Manual conflict resolution, part 1/2 14 years ago
Johan Herland 3228e67120 git notes merge: Add automatic conflict resolvers (ours, theirs, union) 14 years ago
Johan Herland 2085b16aef git notes merge: Handle real, non-conflicting notes merges 14 years ago
Johan Herland 56881843d4 builtin/notes.c: Refactor creation of notes commits. 14 years ago
Johan Herland 75ef3f4a5c git notes merge: Initial implementation handling trivial merges only 14 years ago