summaryrefslogtreecommitdiff
path: root/notes.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/tighten-alloc'Junio C Hamano2016-02-261-1/+1
|\
| * convert trivial cases to ALLOC_ARRAYJeff King2016-02-221-1/+1
* | Merge branch 'jk/notes-merge-from-anywhere'Junio C Hamano2016-02-031-0/+10
|\ \
| * | notes: allow merging from arbitrary referencesjk/notes-merge-from-anywhereJacob Keller2016-01-171-0/+10
| |/
* | notes: allow treeish expressions as notes refmh/notes-allow-reading-treeishMike Hommey2016-01-121-4/+7
|/
* notes: document length of fanout path with a constantJeff King2015-10-051-3/+6
* Sync with 2.4.9Junio C Hamano2015-09-041-9/+10
|\
| * Sync with 2.2.3Junio C Hamano2015-09-041-9/+10
| |\
| | * notes: use a strbuf in add_non_noteJeff King2015-09-041-9/+10
| * | Merge branch 'jk/blame-commit-label' into maintJunio C Hamano2015-02-241-1/+1
| |\ \
* | | | string_list_add_one_ref(): rewrite to take an object_id argumentMichael Haggerty2015-05-251-5/+2
* | | | each_ref_fn: change to take an object_id parameterMichael Haggerty2015-05-251-1/+4
* | | | Merge branch 'jk/blame-commit-label'Junio C Hamano2015-02-111-1/+1
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | use xstrdup_or_null to replace ternary conditionalsJeff King2015-01-131-1/+1
| |/
* | Merge branch 'mh/simplify-repack-without-refs'Junio C Hamano2014-12-221-1/+1
|\ \
| * | sort_string_list(): rename to string_list_sort()mh/simplify-repack-without-refsMichael Haggerty2014-11-251-1/+1
| |/
* | notes: empty notes should be shown by 'git log'Johan Herland2014-11-121-2/+1
|/
* notes.c: rearrange xcalloc argumentsBrian Gesiak2014-05-271-3/+3
* replace {pre,suf}fixcmp() with {starts,ends}_with()cc/starts-n-ends-withChristian Couder2013-12-051-4/+4
* string_list_add_refs_by_glob(): add a comment about memory managementMichael Haggerty2013-06-021-0/+4
* string_list_add_one_ref(): rename first parameter to "refname"Michael Haggerty2013-06-021-3/+3
* Merge branch 'jc/prettier-pretty-note'Junio C Hamano2012-11-151-6/+7
|\
| * format_note(): simplify APIJunio C Hamano2012-10-171-6/+7
* | Merge branch 'mh/notes-string-list'Junio C Hamano2012-11-151-36/+25
|\ \
| * | string_list_add_refs_from_colon_sep(): use string_list_split()Michael Haggerty2012-11-081-13/+8
| * | notes: fix handling of colon-separated valuesMichael Haggerty2012-11-081-2/+2
| * | combine_notes_cat_sort_uniq(): sort and dedup lines all at onceMichael Haggerty2012-11-081-22/+16
| * | Initialize sort_uniq_list using named constantMichael Haggerty2012-11-081-1/+1
| |/
* | Merge branch 'jc/same-encoding'Junio C Hamano2012-11-151-1/+1
|\ \ | |/ |/|
| * reencode_string(): introduce and use same_encoding()Junio C Hamano2012-11-041-1/+1
* | notes.c: mark a private file-scope symbol as staticJunio C Hamano2012-09-151-2/+12
|/
* Do not use C++-style commentsMichael Haggerty2011-08-221-1/+1
* notes: refactor display notes default handlingJeff King2011-03-291-1/+2
* notes: refactor display notes extra refs fieldJeff King2011-03-291-2/+2
* notes: make expand_notes_ref globally accessibleJeff King2011-03-291-0/+10
* Merge branch 'jh/notes-merge'Junio C Hamano2010-12-081-92/+180
|\
| * git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"Johan Herland2010-11-171-0/+76
| * notes.c: Use two newlines (instead of one) when concatenating notesJohan Herland2010-11-171-3/+4
| * notes.h/c: Propagate combine_notes_fn return value to add_note() and beyondJohan Herland2010-11-171-27/+28
| * notes.h/c: Allow combine_notes functions to remove notesJohan Herland2010-11-101-1/+11
| * notes.c: Reorder functions in preparation for next commitJohan Herland2010-11-101-73/+73
| * notes.h: Make default_notes_ref() available in notes APIJohan Herland2010-11-101-1/+1
| * notes.c: Hexify SHA1 in die() message from init_notes()Johan Herland2010-11-101-1/+1
* | notes: Don't create (empty) commit when removing non-existing notesJohan Herland2010-08-311-4/+10
* | Convert the users of for_each_string_list to for_each_string_list_item macroAlex Riesen2010-07-051-32/+14
|/
* Merge branch 'jp/string-list-api-cleanup'Junio C Hamano2010-06-301-6/+6
|\
| * string_list: Fix argument order for string_list_appendJulian Phillips2010-06-271-3/+3
| * string_list: Fix argument order for for_each_string_listJulian Phillips2010-06-271-3/+3
* | Merge branch 'maint'Junio C Hamano2010-06-281-1/+1
|\ \
| * | notes: Initialise variable to appease gccRamsay Jones2010-06-281-1/+1
| |/
View Lorry Controller Status