summaryrefslogtreecommitdiff
path: root/notes-merge.c
AgeCommit message (Expand)Author
2011-11-18Sync with 1.7.7.4Junio C Hamano
2011-11-18Merge branch 'jn/maint-notes-avoid-va-args' into maintJunio C Hamano
2011-11-18notes merge: eliminate OUTPUT macroJonathan Nieder
2011-10-10Merge branch 'mh/maint-notes-merge-pathbuf-fix'Junio C Hamano
2011-10-05Change check_ref_format() to take a flags argumentMichael Haggerty
2011-09-27notes_merge_commit(): do not pass temporary buffer to other functionMichael Haggerty
2011-05-09index_fd(): turn write_object and format_check arguments into one flagJunio C Hamano
2011-03-22Fix sparse warningsStephen Boyd
2011-02-14correct type of EMPTY_TREE_SHA1_BINJonathan Nieder
2010-11-17git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"Johan Herland
2010-11-17git notes merge: List conflicting notes in notes merge commit messageJohan Herland
2010-11-17git notes merge: Manual conflict resolution, part 2/2Johan Herland
2010-11-17git notes merge: Manual conflict resolution, part 1/2Johan Herland
2010-11-17git notes merge: Add automatic conflict resolvers (ours, theirs, union)Johan Herland
2010-11-17git notes merge: Handle real, non-conflicting notes mergesJohan Herland
2010-11-17builtin/notes.c: Refactor creation of notes commits.Johan Herland
2010-11-17git notes merge: Initial implementation handling trivial merges onlyJohan Herland
generated by cgit v0.10.2-6-g49f6 at 2024-04-18 16:32:08 (GMT)