aboutsummaryrefslogtreecommitdiffstats
path: root/notes-merge.c
AgeCommit message (Expand)AuthorFilesLines
2013-07-15remove diff_tree_{setup,release}_pathsNguyễn Thái Ngọc Duy1-2/+2
2013-06-12Move create_notes_commit() from notes-merge.c into notes-utils.cJohan Herland1-26/+1
2012-08-22Merge branch 'tr/void-diff-setup-done'Junio C Hamano1-4/+2
2012-08-03diff_setup_done(): return voidThomas Rast1-4/+2
2012-06-07notes-merge: remove i18n legos in merge result messageNguyễ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 cwdJohan Herland1-4/+9
2012-03-15notes-merge: use opendir/readdir instead of using read_directory()Johan Herland1-20/+30
2012-01-06Merge branch 'jc/show-sig'Junio C Hamano1-1/+1
2011-12-22Merge branch 'nd/war-on-nul-in-commit'Junio C Hamano1-4/+6
2011-12-15Convert commit_tree() to take strbuf as messageNguyễn Thái Ngọc Duy1-4/+6
2011-12-09Merge branch 'nd/resolve-ref'Junio C Hamano1-1/+1
2011-11-18Sync with 1.7.7.4Junio C Hamano1-43/+61
2011-11-18Merge branch 'jn/maint-notes-avoid-va-args' into maintJunio C Hamano1-43/+61
2011-11-17notes merge: eliminate OUTPUT macroJonathan Nieder1-43/+61
2011-11-13Convert many resolve_ref() calls to read_ref*() and ref_exists()Nguyễn Thái Ngọc Duy1-1/+1
2011-11-12commit: teach --gpg-sign optionJunio C Hamano1-1/+1
2011-10-10Merge branch 'mh/maint-notes-merge-pathbuf-fix'Junio C Hamano1-1/+2
2011-10-05Change check_ref_format() to take a flags argumentMichael Haggerty1-2/+3
2011-09-27notes_merge_commit(): do not pass temporary buffer to other functionMichael Haggerty1-1/+2
2011-05-09index_fd(): turn write_object and format_check arguments into one flagJunio C Hamano1-1/+1
2011-03-22Fix sparse warningsStephen Boyd1-1/+1
2011-02-14correct type of EMPTY_TREE_SHA1_BINJonathan Nieder1-1/+1
2010-11-17git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"Johan Herland1-0/+7
2010-11-17git notes merge: List conflicting notes in notes merge commit messageJohan Herland1-1/+10
2010-11-17git notes merge: Manual conflict resolution, part 2/2Johan Herland1-1/+70
2010-11-17git notes merge: Manual conflict resolution, part 1/2Johan Herland1-5/+161
2010-11-17git notes merge: Add automatic conflict resolvers (ours, theirs, union)Johan Herland1-1/+31
2010-11-17git notes merge: Handle real, non-conflicting notes mergesJohan Herland1-3/+322
2010-11-17builtin/notes.c: Refactor creation of notes commits.Johan Herland1-0/+27
2010-11-17git notes merge: Initial implementation handling trivial merges onlyJohan Herland1-0/+120
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-17 21:30:48 +0000