summaryrefslogtreecommitdiff
path: root/builtin/notes.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/notes-merge-config'Junio C Hamano2015-08-311-13/+30
|\
| * notes: teach git-notes about notes.<name>.mergeStrategy optionjk/notes-merge-configJacob Keller2015-08-171-1/+13
| * notes: add notes.mergeStrategy option to select default strategyJacob Keller2015-08-171-2/+17
| * notes: extract parse_notes_merge_strategy to notes-utilsJacob Keller2015-08-171-11/+1
* | Merge branch 'dt/notes-multiple'Junio C Hamano2015-08-251-0/+6
|\ \ | |/ |/|
| * notes: handle multiple worktreesdt/notes-multipleDavid Turner2015-08-111-0/+6
* | standardize usage info string formatAlex Henrie2015-01-141-12/+12
* | builtin/notes: add --allow-empty, to allow storing empty notesJohan Herland2014-11-121-6/+11
* | builtin/notes: split create_note() to clarify add vs. remove logicJohan Herland2014-11-121-49/+54
* | builtin/notes: simplify early exit code in add()Johan Herland2014-11-121-18/+17
* | builtin/notes: refactor note file path into struct note_dataJohan Herland2014-11-101-17/+21
* | builtin/notes: improve namingJohan Herland2014-11-101-55/+54
* | builtin/notes: fix premature failure when trying to add the empty blobJohan Herland2014-11-101-1/+1
|/
* refs.c: change resolve_ref_unsafe reading argument to be a flags fieldRonnie Sahlberg2014-10-151-1/+1
* Merge branch 'ah/grammofix'Junio C Hamano2014-09-191-1/+1
|\
| * grammofix in user-facing messagesah/grammofixAlex Henrie2014-09-021-1/+1
* | run-command: introduce CHILD_PROCESS_INITRené Scharfe2014-08-201-2/+1
|/
* Merge branch 'mh/ref-transaction'Junio C Hamano2014-06-031-3/+3
|\
| * refs.h: rename the action_on_err constantsMichael Haggerty2014-04-071-3/+3
* | parse-options: multi-word argh should use dash to separate wordsJunio C Hamano2014-03-241-1/+1
|/
* Merge branch 'jh/note-trees-record-blobs'Junio C Hamano2014-03-141-1/+5
|\
| * notes: disallow reusing non-blob as a note objectjh/note-trees-record-blobsJohan Herland2014-02-201-1/+5
* | replace {pre,suf}fixcmp() with {starts,ends}_with()cc/starts-n-ends-withChristian Couder2013-12-051-1/+1
* | Replace deprecated OPT_BOOLEAN by OPT_BOOLStefan Beller2013-08-051-2/+2
* | Remove deprecated OPTION_BOOLEAN for parsing argumentsStefan Beller2013-08-051-4/+4
|/
* Merge branch 'ph/builtin-srcs-are-in-subdir-these-days'Junio C Hamano2013-06-261-1/+1
|\
| * fix "builtin-*" references to be "builtin/*"Phil Hord2013-06-181-1/+1
* | Move copy_note_for_rewrite + friends from builtin/notes.c to notes-utils.cJohan Herland2013-06-121-130/+1
* | finish_copy_notes_for_rewrite(): Let caller provide commit messageJohan Herland2013-06-121-4/+5
* | Allow custom "comment char"Junio C Hamano2013-01-161-19/+15
|/
* builtin/notes.c: mark file-scope private symbols as staticJunio C Hamano2012-09-151-2/+5
* Reduce translations by using same terminologiesNguyễn Thái Ngọc Duy2012-08-221-2/+2
* i18n: notes: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-201-60/+60
* Merge branch 'nd/war-on-nul-in-commit'Junio C Hamano2011-12-221-2/+2
|\
| * Convert commit_tree() to take strbuf as messageNguyễn Thái Ngọc Duy2011-12-151-2/+2
* | Convert resolve_ref+xstrdup to new resolve_refdup functionNguyễn Thái Ngọc Duy2011-12-131-3/+4
* | Copy resolve_ref() return value for longer useNguyễn Thái Ngọc Duy2011-12-051-1/+5
|/
* notes remove: --stdin reads from the standard inputJunio C Hamano2011-05-191-4/+15
* notes remove: --ignore-missingJunio C Hamano2011-05-191-4/+10
* notes remove: allow removing more than oneJunio C Hamano2011-05-191-22/+25
* Merge branch 'jk/notes-ui-updates'Junio C Hamano2011-05-021-10/+0
|\
| * notes: make expand_notes_ref globally accessibleJeff King2011-03-291-10/+0
* | Merge branch 'jh/notes-add-ui'Junio C Hamano2011-05-021-3/+17
|\ \
| * | Make "git notes add" more user-friendly when there are existing notesJohan Herland2011-03-301-3/+17
| |/
* | Merge branch 'ab/i18n-st'Junio C Hamano2011-04-011-55/+57
|\ \ | |/ |/|
| * i18n: git-notes GIT_NOTES_REWRITE_MODE error messageÆvar Arnfjörð Bjarmason2011-03-091-2/+4
| * i18n: git-notes basic commandsÆvar Arnfjörð Bjarmason2011-03-091-53/+53
* | Fix sparse warningsStephen Boyd2011-03-221-2/+2
* | Make <identifier> lowercase as per CodingGuidelinesMichael J Gruber2011-02-151-8/+8
|/
* Merge branch 'jh/notes-merge'Junio C Hamano2010-12-081-34/+234
|\
View Lorry Controller Status