aboutsummaryrefslogtreecommitdiff
path: root/builtin/notes.c
Commit message (Expand)AuthorAge
* Merge branch 'jk/notes-merge-from-anywhere'Junio C Hamano2016-02-03
|\
| * notes: allow merging from arbitrary referencesJacob Keller2016-01-17
* | Merge branch 'jc/strbuf-getline'Junio C Hamano2016-01-28
|\ \
| * | strbuf: introduce strbuf_getline_{lf,nul}()Junio C Hamano2016-01-15
| |/
* | notes: allow treeish expressions as notes refMike Hommey2016-01-12
|/
* Remove get_object_hash.brian m. carlson2015-11-20
* Add several uses of get_object_hash.brian m. carlson2015-11-20
* Merge branch 'tk/stripspace'Junio C Hamano2015-10-26
|\
| * strbuf: make stripspace() part of strbufTobias Klauser2015-10-16
* | worktree: add top-level worktree.cMichael Rappazzo2015-10-02
|/
* Merge branch 'jk/notes-merge-config'Junio C Hamano2015-08-31
|\
| * notes: teach git-notes about notes.<name>.mergeStrategy optionJacob Keller2015-08-17
| * notes: add notes.mergeStrategy option to select default strategyJacob Keller2015-08-17
| * notes: extract parse_notes_merge_strategy to notes-utilsJacob Keller2015-08-17
* | Merge branch 'dt/notes-multiple'Junio C Hamano2015-08-25
|\ \ | |/ |/|
| * notes: handle multiple worktreesDavid Turner2015-08-11
* | standardize usage info string formatAlex Henrie2015-01-14
* | builtin/notes: add --allow-empty, to allow storing empty notesJohan Herland2014-11-12
* | builtin/notes: split create_note() to clarify add vs. remove logicJohan Herland2014-11-12
* | builtin/notes: simplify early exit code in add()Johan Herland2014-11-12
* | builtin/notes: refactor note file path into struct note_dataJohan Herland2014-11-10
* | builtin/notes: improve namingJohan Herland2014-11-10
* | builtin/notes: fix premature failure when trying to add the empty blobJohan Herland2014-11-10
|/
* refs.c: change resolve_ref_unsafe reading argument to be a flags fieldRonnie Sahlberg2014-10-15
* Merge branch 'ah/grammofix'Junio C Hamano2014-09-19
|\
| * grammofix in user-facing messagesAlex Henrie2014-09-02
* | run-command: introduce CHILD_PROCESS_INITRené Scharfe2014-08-20
|/
* Merge branch 'mh/ref-transaction'Junio C Hamano2014-06-03
|\
| * refs.h: rename the action_on_err constantsMichael Haggerty2014-04-07
* | 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