summaryrefslogtreecommitdiff
path: root/builtin/notes.c
AgeCommit message (Expand)AuthorFilesLines
2016-01-28Merge branch 'jc/strbuf-getline'Libravatar Junio C Hamano1-1/+1
2016-01-17notes: allow merging from arbitrary referencesLibravatar Jacob Keller1-1/+1
2016-01-15strbuf: introduce strbuf_getline_{lf,nul}()Libravatar Junio C Hamano1-1/+1
2016-01-12notes: allow treeish expressions as notes refLibravatar Mike Hommey1-13/+16
2015-11-20Remove get_object_hash.Libravatar brian m. carlson1-1/+1
2015-11-20Add several uses of get_object_hash.Libravatar brian m. carlson1-1/+1
2015-10-26Merge branch 'tk/stripspace'Libravatar Junio C Hamano1-3/+3
2015-10-16strbuf: make stripspace() part of strbufLibravatar Tobias Klauser1-3/+3
2015-10-02worktree: add top-level worktree.cLibravatar Michael Rappazzo1-1/+1
2015-08-31Merge branch 'jk/notes-merge-config'Libravatar Junio C Hamano1-13/+30
2015-08-25Merge branch 'dt/notes-multiple'Libravatar Junio C Hamano1-0/+6
2015-08-17notes: teach git-notes about notes.<name>.mergeStrategy optionLibravatar Jacob Keller1-1/+13
2015-08-17notes: add notes.mergeStrategy option to select default strategyLibravatar Jacob Keller1-2/+17
2015-08-17notes: extract parse_notes_merge_strategy to notes-utilsLibravatar Jacob Keller1-11/+1
2015-08-11notes: handle multiple worktreesLibravatar David Turner1-0/+6
2015-01-14standardize usage info string formatLibravatar Alex Henrie1-12/+12
2014-11-12builtin/notes: add --allow-empty, to allow storing empty notesLibravatar Johan Herland1-6/+11
2014-11-12builtin/notes: split create_note() to clarify add vs. remove logicLibravatar Johan Herland1-49/+54
2014-11-12builtin/notes: simplify early exit code in add()Libravatar Johan Herland1-18/+17
2014-11-10builtin/notes: refactor note file path into struct note_dataLibravatar Johan Herland1-17/+21
2014-11-10builtin/notes: improve namingLibravatar Johan Herland1-55/+54
2014-11-10builtin/notes: fix premature failure when trying to add the empty blobLibravatar Johan Herland1-1/+1
2014-10-15refs.c: change resolve_ref_unsafe reading argument to be a flags fieldLibravatar Ronnie Sahlberg1-1/+1
2014-09-19Merge branch 'ah/grammofix'Libravatar Junio C Hamano1-1/+1
2014-09-02grammofix in user-facing messagesLibravatar Alex Henrie1-1/+1
2014-08-20run-command: introduce CHILD_PROCESS_INITLibravatar René Scharfe1-2/+1
2014-06-03Merge branch 'mh/ref-transaction'Libravatar Junio C Hamano1-3/+3
2014-04-07refs.h: rename the action_on_err constantsLibravatar Michael Haggerty1-3/+3
2014-03-24parse-options: multi-word argh should use dash to separate wordsLibravatar Junio C Hamano1-1/+1
2014-03-14Merge branch 'jh/note-trees-record-blobs'Libravatar Junio C Hamano1-1/+5
2014-02-20notes: disallow reusing non-blob as a note objectLibravatar Johan Herland1-1/+5
2013-12-05replace {pre,suf}fixcmp() with {starts,ends}_with()Libravatar Christian Couder1-1/+1
2013-08-05Replace deprecated OPT_BOOLEAN by OPT_BOOLLibravatar Stefan Beller1-2/+2
2013-08-05Remove deprecated OPTION_BOOLEAN for parsing argumentsLibravatar Stefan Beller1-4/+4
2013-06-26Merge branch 'ph/builtin-srcs-are-in-subdir-these-days'Libravatar Junio C Hamano1-1/+1
2013-06-18fix "builtin-*" references to be "builtin/*"Libravatar Phil Hord1-1/+1
2013-06-12Move copy_note_for_rewrite + friends from builtin/notes.c to notes-utils.cLibravatar Johan Herland1-130/+1
2013-06-12finish_copy_notes_for_rewrite(): Let caller provide commit messageLibravatar Johan Herland1-4/+5
2013-01-16Allow custom "comment char"Libravatar Junio C Hamano1-19/+15
2012-09-15builtin/notes.c: mark file-scope private symbols as staticLibravatar Junio C Hamano1-2/+5
2012-08-22Reduce translations by using same terminologiesLibravatar Nguyễn Thái Ngọc Duy1-2/+2
2012-08-20i18n: notes: mark parseopt strings for translationLibravatar Nguyễn Thái Ngọc Duy1-60/+60
2011-12-22Merge branch 'nd/war-on-nul-in-commit'Libravatar Junio C Hamano1-2/+2
2011-12-15Convert commit_tree() to take strbuf as messageLibravatar Nguyễn Thái Ngọc Duy1-2/+2
2011-12-13Convert resolve_ref+xstrdup to new resolve_refdup functionLibravatar Nguyễn Thái Ngọc Duy1-3/+4
2011-12-05Copy resolve_ref() return value for longer useLibravatar Nguyễn Thái Ngọc Duy1-1/+5
2011-05-19notes remove: --stdin reads from the standard inputLibravatar Junio C Hamano1-4/+15
2011-05-19notes remove: --ignore-missingLibravatar Junio C Hamano1-4/+10
2011-05-19notes remove: allow removing more than oneLibravatar Junio C Hamano1-22/+25
2011-05-02Merge branch 'jk/notes-ui-updates'Libravatar Junio C Hamano1-10/+0