Age | Commit message (Expand) | Author | Files | Lines |
2011-11-18 | Sync with 1.7.7.4 | Junio C Hamano | 1 | -43/+61 |
2011-11-18 | Merge branch 'jn/maint-notes-avoid-va-args' into maint | Junio C Hamano | 1 | -43/+61 |
2011-11-17 | notes merge: eliminate OUTPUT macro | Jonathan Nieder | 1 | -43/+61 |
2011-10-10 | Merge branch 'mh/maint-notes-merge-pathbuf-fix' | Junio C Hamano | 1 | -1/+2 |
2011-10-05 | Change check_ref_format() to take a flags argument | Michael Haggerty | 1 | -2/+3 |
2011-09-27 | notes_merge_commit(): do not pass temporary buffer to other function | Michael Haggerty | 1 | -1/+2 |
2011-05-09 | index_fd(): turn write_object and format_check arguments into one flag | Junio C Hamano | 1 | -1/+1 |
2011-03-22 | Fix sparse warnings | Stephen Boyd | 1 | -1/+1 |
2011-02-14 | correct type of EMPTY_TREE_SHA1_BIN | Jonathan Nieder | 1 | -1/+1 |
2010-11-17 | git notes merge: Add another auto-resolving strategy: "cat_sort_uniq" | Johan Herland | 1 | -0/+7 |
2010-11-17 | git notes merge: List conflicting notes in notes merge commit message | Johan Herland | 1 | -1/+10 |
2010-11-17 | git notes merge: Manual conflict resolution, part 2/2 | Johan Herland | 1 | -1/+70 |
2010-11-17 | git notes merge: Manual conflict resolution, part 1/2 | Johan Herland | 1 | -5/+161 |
2010-11-17 | git notes merge: Add automatic conflict resolvers (ours, theirs, union) | Johan Herland | 1 | -1/+31 |
2010-11-17 | git notes merge: Handle real, non-conflicting notes merges | Johan Herland | 1 | -3/+322 |
2010-11-17 | builtin/notes.c: Refactor creation of notes commits. | Johan Herland | 1 | -0/+27 |
2010-11-17 | git notes merge: Initial implementation handling trivial merges only | Johan Herland | 1 | -0/+120 |