summaryrefslogtreecommitdiff
path: root/notes-merge.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'en/dir-traversal'Junio C Hamano2021-05-201-4/+1
|\
| * dir: introduce readdir_skip_dot_and_dotdot() helperElijah Newren2021-05-131-4/+1
* | Merge branch 'js/merge-already-up-to-date-message-reword'Junio C Hamano2021-05-111-1/+1
|\ \
| * | merge(s): apply consistent punctuation to "up to date" messagesEric Sunshine2021-05-031-1/+1
| |/
* | hash: provide per-algorithm null OIDsbrian m. carlson2021-04-271-1/+1
|/
* use CALLOC_ARRAYRené Scharfe2021-03-131-1/+1
* notes-merge: switch to use the_hash_algobrian m. carlson2019-04-011-3/+3
* notes-utils.c: remove the_repository referencesNguyễn Thái Ngọc Duy2019-01-141-2/+2
* notes-merge.c: remove implicit dependency the_repositoryNguyễn Thái Ngọc Duy2018-11-121-2/+2
* notes-merge.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-11-121-5/+7
* Merge branch 'nd/the-index'Junio C Hamano2018-10-191-4/+5
|\
| * sha1-file.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-1/+1
| * ll-merge.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-1/+2
| * diff.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-2/+2
* | Merge branch 'jk/cocci'Junio C Hamano2018-09-171-12/+12
|\ \
| * | convert "oidcmp() == 0" to oideq()Jeff King2018-08-291-12/+12
| |/
* | commit.h: remove method declarationsDerrick Stolee2018-07-201-0/+1
|/
* commit: add repository argument to lookup_commit_referenceStefan Beller2018-06-291-2/+3
* Merge branch 'sb/object-store-grafts' into sb/object-store-lookupJunio C Hamano2018-06-291-0/+1
|\
| * object-store: move object access functions to object-store.hStefan Beller2018-05-161-0/+1
* | Merge branch 'js/use-bug-macro'Junio C Hamano2018-05-301-2/+2
|\ \
| * | Replace all die("BUG: ...") calls by BUG() onesJohannes Schindelin2018-05-061-2/+2
| |/
* | Merge branch 'ds/lazy-load-trees'Junio C Hamano2018-05-231-4/+5
|\ \ | |/ |/|
| * treewide: replace maybe_tree with accessor methodsDerrick Stolee2018-04-111-4/+5
| * treewide: rename tree to maybe_treeDerrick Stolee2018-04-111-4/+4
* | sha1_file: convert read_sha1_file to struct object_idbrian m. carlson2018-03-141-1/+1
|/
* commit: convert commit_tree* to object_idPatryk Obara2018-01-301-5/+4
* Switch empty tree and blob lookups to use hash abstractionbrian m. carlson2017-11-131-1/+1
* Merge branch 'bw/diff-opt-impl-to-bitfields'Junio C Hamano2017-11-091-2/+2
|\
| * diff: make struct diff_flags members lowercasebw/diff-opt-impl-to-bitfieldsBrandon Williams2017-11-011-2/+2
| * diff: remove DIFF_OPT_SET macroBrandon Williams2017-11-011-2/+2
* | refs: convert read_ref and read_ref_full to object_idbrian m. carlson2017-10-161-1/+1
|/
* notes-merge: drop dead zero-write codeJeff King2017-09-261-2/+0
* Merge branch 'jk/write-in-full-fix'Junio C Hamano2017-09-251-1/+1
|\
| * notes-merge: use ssize_t for write_in_full() return valueJeff King2017-09-141-1/+1
* | Merge branch 'ma/up-to-date'Junio C Hamano2017-09-101-1/+1
|\ \
| * | treewide: correct several "up-to-date" to "up to date"ma/up-to-dateMartin Ågren2017-08-231-1/+1
* | | sha1_file: convert index_path to struct object_idPatryk Obara2017-08-201-1/+1
| |/ |/|
* | use MOVE_ARRAYRené Scharfe2017-07-171-2/+1
|/
* diff-tree: convert diff_tree_sha1 to struct object_idBrandon Williams2017-06-051-2/+2
* notes-merge: convert write_note_to_worktree to struct object_idBrandon Williams2017-06-051-10/+10
* notes-merge: convert verify_notes_filepair to struct object_idBrandon Williams2017-06-051-10/+10
* notes-merge: convert find_notes_merge_pair_ps to struct object_idBrandon Williams2017-06-051-12/+12
* notes-merge: convert merge_from_diffs to struct object_idBrandon Williams2017-06-051-15/+16
* notes-merge: convert notes_merge* to struct object_idBrandon Williams2017-06-051-29/+29
* notes: convert some accessor functions to struct object_idbrian m. carlson2017-06-021-9/+9
* Convert lookup_commit* to struct object_idbrian m. carlson2017-05-081-2/+2
* Convert remaining callers of lookup_commit_reference* to object_idbrian m. carlson2017-05-081-13/+13
* replace strbuf_addstr(git_path()) with git_path_buf()Jeff King2017-04-201-2/+2
* Merge branch 'va/i18n-more'Junio C Hamano2016-09-261-4/+4
|\
View Lorry Controller Status