aboutsummaryrefslogtreecommitdiff
path: root/notes-merge.c
Commit message (Expand)AuthorAge
* notes_merge_commit(): do not pass temporary buffer to other functionMichael Haggerty2011-09-27
* index_fd(): turn write_object and format_check arguments into one flagJunio C Hamano2011-05-09
* Fix sparse warningsStephen Boyd2011-03-22
* correct type of EMPTY_TREE_SHA1_BINJonathan Nieder2011-02-14
* git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"Johan Herland2010-11-17
* git notes merge: List conflicting notes in notes merge commit messageJohan Herland2010-11-17
* git notes merge: Manual conflict resolution, part 2/2Johan Herland2010-11-17
* git notes merge: Manual conflict resolution, part 1/2Johan Herland2010-11-17
* git notes merge: Add automatic conflict resolvers (ours, theirs, union)Johan Herland2010-11-17
* git notes merge: Handle real, non-conflicting notes mergesJohan Herland2010-11-17
* builtin/notes.c: Refactor creation of notes commits.Johan Herland2010-11-17
* git notes merge: Initial implementation handling trivial merges onlyJohan Herland2010-11-17