summaryrefslogtreecommitdiff
path: root/notes-merge.c
AgeCommit message (Expand)Author
5 daysMerge branch 'js/merge-already-up-to-date-message-reword'Junio C Hamano
13 daysmerge(s): apply consistent punctuation to "up to date" messagesEric Sunshine
2021-04-27hash: provide per-algorithm null OIDsbrian m. carlson
2021-03-14use CALLOC_ARRAYRené Scharfe
2019-04-01notes-merge: switch to use the_hash_algobrian m. carlson
2019-01-14notes-utils.c: remove the_repository referencesNguyễn Thái Ngọc Duy
2018-11-12notes-merge.c: remove implicit dependency the_repositoryNguyễn Thái Ngọc Duy
2018-11-12notes-merge.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy
2018-10-19Merge branch 'nd/the-index'Junio C Hamano
2018-09-21sha1-file.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy
2018-09-21ll-merge.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy
2018-09-21diff.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy
2018-09-17Merge branch 'jk/cocci'Junio C Hamano
2018-08-29convert "oidcmp() == 0" to oideq()Jeff King
2018-07-20commit.h: remove method declarationsDerrick Stolee
2018-06-29commit: add repository argument to lookup_commit_referenceStefan Beller
2018-06-29Merge branch 'sb/object-store-grafts' into sb/object-store-lookupJunio C Hamano
2018-05-30Merge branch 'js/use-bug-macro'Junio C Hamano
2018-05-23Merge branch 'ds/lazy-load-trees'Junio C Hamano
2018-05-16object-store: move object access functions to object-store.hStefan Beller
2018-05-06Replace all die("BUG: ...") calls by BUG() onesJohannes Schindelin
2018-04-11treewide: replace maybe_tree with accessor methodsDerrick Stolee
2018-04-11treewide: rename tree to maybe_treeDerrick Stolee
2018-03-14sha1_file: convert read_sha1_file to struct object_idbrian m. carlson
2018-01-30commit: convert commit_tree* to object_idPatryk Obara
2017-11-13Switch empty tree and blob lookups to use hash abstractionbrian m. carlson
2017-11-09Merge branch 'bw/diff-opt-impl-to-bitfields'Junio C Hamano
2017-11-01diff: make struct diff_flags members lowercaseBrandon Williams
2017-11-01diff: remove DIFF_OPT_SET macroBrandon Williams
2017-10-16refs: convert read_ref and read_ref_full to object_idbrian m. carlson
2017-09-26notes-merge: drop dead zero-write codeJeff King
2017-09-25Merge branch 'jk/write-in-full-fix'Junio C Hamano
2017-09-14notes-merge: use ssize_t for write_in_full() return valueJeff King
2017-09-10Merge branch 'ma/up-to-date'Junio C Hamano
2017-08-23treewide: correct several "up-to-date" to "up to date"Martin Ågren
2017-08-21sha1_file: convert index_path to struct object_idPatryk Obara
2017-07-17use MOVE_ARRAYRené Scharfe
2017-06-05diff-tree: convert diff_tree_sha1 to struct object_idBrandon Williams
2017-06-05notes-merge: convert write_note_to_worktree to struct object_idBrandon Williams
2017-06-05notes-merge: convert verify_notes_filepair to struct object_idBrandon Williams
2017-06-05notes-merge: convert find_notes_merge_pair_ps to struct object_idBrandon Williams
2017-06-05notes-merge: convert merge_from_diffs to struct object_idBrandon Williams
2017-06-05notes-merge: convert notes_merge* to struct object_idBrandon Williams
2017-06-02notes: convert some accessor functions to struct object_idbrian m. carlson
2017-05-08Convert lookup_commit* to struct object_idbrian m. carlson
2017-05-08Convert remaining callers of lookup_commit_reference* to object_idbrian m. carlson
2017-04-21replace strbuf_addstr(git_path()) with git_path_buf()Jeff King
2016-09-26Merge branch 'va/i18n-more'Junio C Hamano
2016-09-21i18n: notes-merge: mark die messages for translationVasco Almeida
2016-09-07Convert read_mmblob to take struct object_id.brian m. carlson