aboutsummaryrefslogtreecommitdiff
path: root/builtin/notes.c
Commit message (Expand)AuthorAge
* parse-options: multi-word argh should use dash to separate wordsJunio C Hamano2014-03-24
* Merge branch 'jh/note-trees-record-blobs'Junio C Hamano2014-03-14
|\
| * notes: disallow reusing non-blob as a note objectJohan Herland2014-02-20
* | replace {pre,suf}fixcmp() with {starts,ends}_with()Christian Couder2013-12-05
* | Replace deprecated OPT_BOOLEAN by OPT_BOOLStefan Beller2013-08-05
* | Remove deprecated OPTION_BOOLEAN for parsing argumentsStefan Beller2013-08-05
|/
* Merge branch 'ph/builtin-srcs-are-in-subdir-these-days'Junio C Hamano2013-06-26
|\
| * fix "builtin-*" references to be "builtin/*"Phil Hord2013-06-18
* | Move copy_note_for_rewrite + friends from builtin/notes.c to notes-utils.cJohan Herland2013-06-12
* | finish_copy_notes_for_rewrite(): Let caller provide commit messageJohan Herland2013-06-12
* | Allow custom "comment char"Junio C Hamano2013-01-16
|/
* builtin/notes.c: mark file-scope private symbols as staticJunio C Hamano2012-09-15
* Reduce translations by using same terminologiesNguyễn Thái Ngọc Duy2012-08-22
* i18n: notes: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-20
* Merge branch 'nd/war-on-nul-in-commit'Junio C Hamano2011-12-22
|\
| * Convert commit_tree() to take strbuf as messageNguyễn Thái Ngọc Duy2011-12-15
* | Convert resolve_ref+xstrdup to new resolve_refdup functionNguyễn Thái Ngọc Duy2011-12-13
* | Copy resolve_ref() return value for longer useNguyễn Thái Ngọc Duy2011-12-05
|/
* notes remove: --stdin reads from the standard inputJunio C Hamano2011-05-19
* notes remove: --ignore-missingJunio C Hamano2011-05-19
* notes remove: allow removing more than oneJunio C Hamano2011-05-19
* Merge branch 'jk/notes-ui-updates'Junio C Hamano2011-05-02
|\
| * notes: make expand_notes_ref globally accessibleJeff King2011-03-29
* | Merge branch 'jh/notes-add-ui'Junio C Hamano2011-05-02
|\ \
| * | Make "git notes add" more user-friendly when there are existing notesJohan Herland2011-03-30
| |/
* | Merge branch 'ab/i18n-st'Junio C Hamano2011-04-01
|\ \ | |/ |/|
| * i18n: git-notes GIT_NOTES_REWRITE_MODE error messageÆvar Arnfjörð Bjarmason2011-03-09
| * i18n: git-notes basic commandsÆvar Arnfjörð Bjarmason2011-03-09
* | Fix sparse warningsStephen Boyd2011-03-22
* | Make <identifier> lowercase as per CodingGuidelinesMichael J Gruber2011-02-15
|/
* Merge branch 'jh/notes-merge'Junio C Hamano2010-12-08
|\
| * Provide 'git notes get-ref' to easily retrieve current notes refJohan Herland2010-11-17
| * git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"Johan Herland2010-11-17
| * git notes merge: --commit should fail if underlying notes ref has movedJohan 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
| * builtin/notes.c: Split notes ref DWIMmery into a separate functionJohan Herland2010-11-17
| * notes.h/c: Propagate combine_notes_fn return value to add_note() and beyondJohan Herland2010-11-17
* | add OPT__FORCERené Scharfe2010-11-15
* | add description parameter to OPT__DRY_RUNRené Scharfe2010-11-15
* | add description parameter to OPT__VERBOSERené Scharfe2010-11-15
* | notes: Don't create (empty) commit when removing non-existing notesJohan Herland2010-08-31
|/
* notes: allow --dry-run for -n and --verbose for -vRené Scharfe2010-08-09
* Merge branch 'maint'Junio C Hamano2010-06-28
|\
| * notes: check number of parameters to "git notes copy"Jeff King2010-06-28