summaryrefslogtreecommitdiff
path: root/notes-merge.c
AgeCommit message (Expand)AuthorFilesLines
2016-09-21i18n: notes-merge: mark die messages for translationLibravatar Vasco Almeida1-4/+4
2016-09-07Convert read_mmblob to take struct object_id.Libravatar brian m. carlson1-3/+3
2016-09-07notes-merge: convert struct notes_merge_pair to struct object_idLibravatar brian m. carlson1-62/+65
2016-07-28Merge branch 'rs/notes-merge-no-toctou'Libravatar Junio C Hamano1-5/+1
2016-07-19Merge branch 'bc/cocci'Libravatar Junio C Hamano1-21/+21
2016-07-07notes-merge: use O_EXCL to avoid overwriting existing filesLibravatar René Scharfe1-5/+1
2016-06-28diff: convert struct diff_filespec to struct object_idLibravatar brian m. carlson1-21/+21
2016-06-02pathspec: rename free_pathspec() to clear_pathspec()Libravatar Junio C Hamano1-2/+2
2015-11-20Remove get_object_hash.Libravatar brian m. carlson1-10/+10
2015-11-20Convert struct object to object_idLibravatar brian m. carlson1-2/+2
2015-11-20Add several uses of get_object_hash.Libravatar brian m. carlson1-10/+10
2015-08-10prefer git_pathdup to git_path in some possibly-dangerous casesLibravatar Jeff King1-1/+2
2015-05-11Merge branch 'nd/multiple-work-trees'Libravatar Junio C Hamano1-3/+3
2015-01-07Merge branch 'jc/merge-bases'Libravatar Junio C Hamano1-1/+1
2014-12-01path.c: make get_pathname() call sites return const char *Libravatar Nguyễn Thái Ngọc Duy1-3/+3
2014-10-30get_merge_bases(): always clean-up object flagsLibravatar Junio C Hamano1-1/+1
2014-10-15refs.c: change resolve_ref_unsafe reading argument to be a flags fieldLibravatar Ronnie Sahlberg1-1/+1
2014-06-13commit: record buffer length in cacheLibravatar Jeff King1-1/+1
2014-06-13use get_commit_buffer everywhereLibravatar Jeff King1-1/+3
2014-06-12replace dangerous uses of strbuf_attachLibravatar Jeff King1-4/+1
2014-06-12commit_tree: take a pointer/len pair rather than a const strbufLibravatar Jeff King1-2/+4
2013-07-15remove diff_tree_{setup,release}_pathsLibravatar Nguyễn Thái Ngọc Duy1-2/+2
2013-06-12Move create_notes_commit() from notes-merge.c into notes-utils.cLibravatar Johan Herland1-26/+1
2012-08-22Merge branch 'tr/void-diff-setup-done'Libravatar Junio C Hamano1-4/+2
2012-08-03diff_setup_done(): return voidLibravatar Thomas Rast1-4/+2
2012-06-07notes-merge: remove i18n legos in merge result messageLibravatar Nguyễn Thái Ngọc Duy1-2/+4
2012-03-15notes-merge: Don't remove .git/NOTES_MERGE_WORKTREE; it may be the user's cwdLibravatar Johan Herland1-4/+9
2012-03-15notes-merge: use opendir/readdir instead of using read_directory()Libravatar Johan Herland1-20/+30
2012-01-06Merge branch 'jc/show-sig'Libravatar Junio C Hamano1-1/+1
2011-12-22Merge branch 'nd/war-on-nul-in-commit'Libravatar Junio C Hamano1-4/+6
2011-12-15Convert commit_tree() to take strbuf as messageLibravatar Nguyễn Thái Ngọc Duy1-4/+6
2011-12-09Merge branch 'nd/resolve-ref'Libravatar Junio C Hamano1-1/+1
2011-11-18Sync with 1.7.7.4Libravatar Junio C Hamano1-43/+61
2011-11-18Merge branch 'jn/maint-notes-avoid-va-args' into maintLibravatar Junio C Hamano1-43/+61
2011-11-17notes merge: eliminate OUTPUT macroLibravatar Jonathan Nieder1-43/+61
2011-11-13Convert many resolve_ref() calls to read_ref*() and ref_exists()Libravatar Nguyễn Thái Ngọc Duy1-1/+1
2011-11-12commit: teach --gpg-sign optionLibravatar Junio C Hamano1-1/+1
2011-10-10Merge branch 'mh/maint-notes-merge-pathbuf-fix'Libravatar Junio C Hamano1-1/+2
2011-10-05Change check_ref_format() to take a flags argumentLibravatar Michael Haggerty1-2/+3
2011-09-27notes_merge_commit(): do not pass temporary buffer to other functionLibravatar Michael Haggerty1-1/+2
2011-05-09index_fd(): turn write_object and format_check arguments into one flagLibravatar Junio C Hamano1-1/+1
2011-03-22Fix sparse warningsLibravatar Stephen Boyd1-1/+1
2011-02-14correct type of EMPTY_TREE_SHA1_BINLibravatar Jonathan Nieder1-1/+1
2010-11-17git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"Libravatar Johan Herland1-0/+7
2010-11-17git notes merge: List conflicting notes in notes merge commit messageLibravatar Johan Herland1-1/+10
2010-11-17git notes merge: Manual conflict resolution, part 2/2Libravatar Johan Herland1-1/+70
2010-11-17git notes merge: Manual conflict resolution, part 1/2Libravatar Johan Herland1-5/+161
2010-11-17git notes merge: Add automatic conflict resolvers (ours, theirs, union)Libravatar Johan Herland1-1/+31
2010-11-17git notes merge: Handle real, non-conflicting notes mergesLibravatar Johan Herland1-3/+322
2010-11-17builtin/notes.c: Refactor creation of notes commits.Libravatar Johan Herland1-0/+27
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 10:53:04 +0000