summaryrefslogtreecommitdiff
path: root/builtin/notes.c
AgeCommit message (Expand)AuthorFilesLines
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
2011-05-02Merge branch 'jh/notes-add-ui'Libravatar Junio C Hamano1-3/+17
2011-04-01Merge branch 'ab/i18n-st'Libravatar Junio C Hamano1-55/+57
2011-03-30Make "git notes add" more user-friendly when there are existing notesLibravatar Johan Herland1-3/+17
2011-03-29notes: make expand_notes_ref globally accessibleLibravatar Jeff King1-10/+0
2011-03-22Fix sparse warningsLibravatar Stephen Boyd1-2/+2
2011-03-09i18n: git-notes GIT_NOTES_REWRITE_MODE error messageLibravatar Ævar Arnfjörð Bjarmason1-2/+4
2011-03-09i18n: git-notes basic commandsLibravatar Ævar Arnfjörð Bjarmason1-53/+53
2011-02-15Make <identifier> lowercase as per CodingGuidelinesLibravatar Michael J Gruber1-8/+8
2010-12-08Merge branch 'jh/notes-merge'Libravatar Junio C Hamano1-34/+234
2010-11-17Provide 'git notes get-ref' to easily retrieve current notes refLibravatar Johan Herland1-0/+23
2010-11-17git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"Libravatar Johan Herland1-2/+6
2010-11-17git notes merge: --commit should fail if underlying notes ref has movedLibravatar Johan Herland1-2/+9
2010-11-17git notes merge: List conflicting notes in notes merge commit messageLibravatar Johan Herland1-1/+1
2010-11-17git notes merge: Manual conflict resolution, part 2/2Libravatar Johan Herland1-3/+103
2010-11-17git notes merge: Manual conflict resolution, part 1/2Libravatar Johan Herland1-4/+4
2010-11-17git notes merge: Add automatic conflict resolvers (ours, theirs, union)Libravatar Johan Herland1-1/+20
2010-11-17git notes merge: Handle real, non-conflicting notes mergesLibravatar Johan Herland1-5/+10
2010-11-17builtin/notes.c: Refactor creation of notes commits.Libravatar Johan Herland1-23/+5
2010-11-17git notes merge: Initial implementation handling trivial merges onlyLibravatar Johan Herland1-0/+54
2010-11-17builtin/notes.c: Split notes ref DWIMmery into a separate functionLibravatar Johan Herland1-6/+11
2010-11-17notes.h/c: Propagate combine_notes_fn return value to add_note() and beyondLibravatar Johan Herland1-5/+6
2010-11-15add OPT__FORCELibravatar René Scharfe1-2/+2