summaryrefslogtreecommitdiff
path: root/builtin/notes.c
AgeCommit message (Expand)Author
2017-03-17Merge branch 'bc/object-id'Junio C Hamano
2017-02-22Convert remaining callers of resolve_refdup to object_idbrian m. carlson
2017-02-21delete_ref: accept a reflog message argumentKyle Meyer
2016-09-15notes: spell first word of error messages in lowercaseVasco Almeida
2016-09-15i18n: notes: mark error messages for translationVasco Almeida
2016-07-28i18n: notes: mark comment for translationVasco Almeida
2016-06-17i18n: notes: mark options for translationVasco Almeida
2016-06-17i18n: notes: mark strings for translationVasco Almeida
2016-04-22worktree.c: make find_shared_symref() return struct worktree *Nguyễn Thái Ngọc Duy
2016-04-13Merge branch 'sb/misc-cleanups'Junio C Hamano
2016-04-01notes: don't leak memory in git_config_get_notes_strategyStefan Beller
2016-02-03Merge branch 'jk/notes-merge-from-anywhere'Junio C Hamano
2016-01-29Merge branch 'jc/strbuf-getline'Junio C Hamano
2016-01-17notes: allow merging from arbitrary referencesJacob Keller
2016-01-15strbuf: introduce strbuf_getline_{lf,nul}()Junio C Hamano
2016-01-12notes: allow treeish expressions as notes refMike Hommey
2015-11-20Remove get_object_hash.brian m. carlson
2015-11-20Add several uses of get_object_hash.brian m. carlson
2015-10-26Merge branch 'tk/stripspace'Junio C Hamano
2015-10-16strbuf: make stripspace() part of strbufTobias Klauser
2015-10-02worktree: add top-level worktree.cMichael Rappazzo
2015-08-31Merge branch 'jk/notes-merge-config'Junio C Hamano
2015-08-25Merge branch 'dt/notes-multiple'Junio C Hamano
2015-08-17notes: teach git-notes about notes.<name>.mergeStrategy optionJacob Keller
2015-08-17notes: add notes.mergeStrategy option to select default strategyJacob Keller
2015-08-17notes: extract parse_notes_merge_strategy to notes-utilsJacob Keller
2015-08-11notes: handle multiple worktreesDavid Turner
2015-01-14standardize usage info string formatAlex Henrie
2014-11-12builtin/notes: add --allow-empty, to allow storing empty notesJohan Herland
2014-11-12builtin/notes: split create_note() to clarify add vs. remove logicJohan Herland
2014-11-12builtin/notes: simplify early exit code in add()Johan Herland
2014-11-10builtin/notes: refactor note file path into struct note_dataJohan Herland
2014-11-10builtin/notes: improve namingJohan Herland
2014-11-10builtin/notes: fix premature failure when trying to add the empty blobJohan Herland
2014-10-15refs.c: change resolve_ref_unsafe reading argument to be a flags fieldRonnie Sahlberg
2014-09-19Merge branch 'ah/grammofix'Junio C Hamano
2014-09-02grammofix in user-facing messagesAlex Henrie
2014-08-20run-command: introduce CHILD_PROCESS_INITRené Scharfe
2014-06-03Merge branch 'mh/ref-transaction'Junio C Hamano
2014-04-07refs.h: rename the action_on_err constantsMichael Haggerty
2014-03-24parse-options: multi-word argh should use dash to separate wordsJunio C Hamano
2014-03-14Merge branch 'jh/note-trees-record-blobs'Junio C Hamano
2014-02-20notes: disallow reusing non-blob as a note objectJohan Herland
2013-12-05replace {pre,suf}fixcmp() with {starts,ends}_with()Christian Couder
2013-08-05Replace deprecated OPT_BOOLEAN by OPT_BOOLStefan Beller
2013-08-05Remove deprecated OPTION_BOOLEAN for parsing argumentsStefan Beller
2013-06-26Merge branch 'ph/builtin-srcs-are-in-subdir-these-days'Junio C Hamano
2013-06-18fix "builtin-*" references to be "builtin/*"Phil Hord
2013-06-12Move copy_note_for_rewrite + friends from builtin/notes.c to notes-utils.cJohan Herland
2013-06-12finish_copy_notes_for_rewrite(): Let caller provide commit messageJohan Herland