summaryrefslogtreecommitdiff
path: root/notes-merge.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nd/resolve-ref'Junio C Hamano2011-12-091-1/+1
|\
| * Convert many resolve_ref() calls to read_ref*() and ref_exists()Nguyễn Thái Ngọc Duy2011-11-131-1/+1
* | Sync with 1.7.7.4Junio C Hamano2011-11-181-43/+61
|\ \ | |/ |/|
| * Merge branch 'jn/maint-notes-avoid-va-args' into maintJunio C Hamano2011-11-181-43/+61
| |\
| | * notes merge: eliminate OUTPUT macrojn/maint-notes-avoid-va-argsJonathan Nieder2011-11-171-43/+61
* | | Merge branch 'mh/maint-notes-merge-pathbuf-fix'Junio C Hamano2011-10-101-1/+2
|\ \ \ | |/ /
| * | notes_merge_commit(): do not pass temporary buffer to other functionMichael Haggerty2011-09-271-1/+2
* | | Change check_ref_format() to take a flags argumentMichael Haggerty2011-10-051-2/+3
|/ /
* | index_fd(): turn write_object and format_check arguments into one flagJunio C Hamano2011-05-091-1/+1
* | Fix sparse warningsStephen Boyd2011-03-221-1/+1
|/
* correct type of EMPTY_TREE_SHA1_BINJonathan Nieder2011-02-141-1/+1
* git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"Johan Herland2010-11-171-0/+7
* git notes merge: List conflicting notes in notes merge commit messageJohan Herland2010-11-171-1/+10
* git notes merge: Manual conflict resolution, part 2/2Johan Herland2010-11-171-1/+70
* git notes merge: Manual conflict resolution, part 1/2Johan Herland2010-11-171-5/+161
* git notes merge: Add automatic conflict resolvers (ours, theirs, union)Johan Herland2010-11-171-1/+31
* git notes merge: Handle real, non-conflicting notes mergesJohan Herland2010-11-171-3/+322
* builtin/notes.c: Refactor creation of notes commits.Johan Herland2010-11-171-0/+27
* git notes merge: Initial implementation handling trivial merges onlyJohan Herland2010-11-171-0/+120
View Lorry Controller Status