aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/notes.c
AgeCommit message (Expand)AuthorFilesLines
2016-04-22worktree.c: make find_shared_symref() return struct worktree *Nguyễn Thái Ngọc Duy1-4/+4
2016-04-13Merge branch 'sb/misc-cleanups'Junio C Hamano1-2/+3
2016-04-01notes: don't leak memory in git_config_get_notes_strategyStefan Beller1-2/+3
2016-02-03Merge branch 'jk/notes-merge-from-anywhere'Junio C Hamano1-1/+1
2016-01-28Merge branch 'jc/strbuf-getline'Junio C Hamano1-1/+1
2016-01-17notes: allow merging from arbitrary referencesJacob Keller1-1/+1
2016-01-15strbuf: introduce strbuf_getline_{lf,nul}()Junio C Hamano1-1/+1
2016-01-12notes: allow treeish expressions as notes refMike Hommey1-13/+16
2015-11-20Remove get_object_hash.brian m. carlson1-1/+1
2015-11-20Add several uses of get_object_hash.brian m. carlson1-1/+1
2015-10-26Merge branch 'tk/stripspace'Junio C Hamano1-3/+3
2015-10-16strbuf: make stripspace() part of strbufTobias Klauser1-3/+3
2015-10-02worktree: add top-level worktree.cMichael Rappazzo1-1/+1
2015-08-31Merge branch 'jk/notes-merge-config'Junio C Hamano1-13/+30
2015-08-25Merge branch 'dt/notes-multiple'Junio C Hamano1-0/+6
2015-08-17notes: teach git-notes about notes.<name>.mergeStrategy optionJacob Keller1-1/+13
2015-08-17notes: add notes.mergeStrategy option to select default strategyJacob Keller1-2/+17
2015-08-17notes: extract parse_notes_merge_strategy to notes-utilsJacob Keller1-11/+1
2015-08-11notes: handle multiple worktreesDavid Turner1-0/+6
2015-01-14standardize usage info string formatAlex Henrie1-12/+12
2014-11-12builtin/notes: add --allow-empty, to allow storing empty notesJohan Herland1-6/+11
2014-11-12builtin/notes: split create_note() to clarify add vs. remove logicJohan Herland1-49/+54
2014-11-12builtin/notes: simplify early exit code in add()Johan Herland1-18/+17
2014-11-10builtin/notes: refactor note file path into struct note_dataJohan Herland1-17/+21
2014-11-10builtin/notes: improve namingJohan Herland1-55/+54
2014-11-10builtin/notes: fix premature failure when trying to add the empty blobJohan Herland1-1/+1
2014-10-15refs.c: change resolve_ref_unsafe reading argument to be a flags fieldRonnie Sahlberg1-1/+1
2014-09-19Merge branch 'ah/grammofix'Junio C Hamano1-1/+1
2014-09-02grammofix in user-facing messagesAlex Henrie1-1/+1
2014-08-20run-command: introduce CHILD_PROCESS_INITRené Scharfe1-2/+1
2014-06-03Merge branch 'mh/ref-transaction'Junio C Hamano1-3/+3
2014-04-07refs.h: rename the action_on_err constantsMichael Haggerty1-3/+3
2014-03-24parse-options: multi-word argh should use dash to separate wordsJunio C Hamano1-1/+1
2014-03-14Merge branch 'jh/note-trees-record-blobs'Junio C Hamano1-1/+5
2014-02-20notes: disallow reusing non-blob as a note objectJohan Herland1-1/+5
2013-12-05replace {pre,suf}fixcmp() with {starts,ends}_with()Christian Couder1-1/+1
2013-08-05Replace deprecated OPT_BOOLEAN by OPT_BOOLStefan Beller1-2/+2
2013-08-05Remove deprecated OPTION_BOOLEAN for parsing argumentsStefan Beller1-4/+4
2013-06-26Merge branch 'ph/builtin-srcs-are-in-subdir-these-days'Junio C Hamano1-1/+1
2013-06-18fix "builtin-*" references to be "builtin/*"Phil Hord1-1/+1
2013-06-12Move copy_note_for_rewrite + friends from builtin/notes.c to notes-utils.cJohan Herland1-130/+1
2013-06-12finish_copy_notes_for_rewrite(): Let caller provide commit messageJohan Herland1-4/+5
2013-01-16Allow custom "comment char"Junio C Hamano1-19/+15
2012-09-15builtin/notes.c: mark file-scope private symbols as staticJunio C Hamano1-2/+5
2012-08-22Reduce translations by using same terminologiesNguyễn Thái Ngọc Duy1-2/+2
2012-08-20i18n: notes: mark parseopt strings for translationNguyễn Thái Ngọc Duy1-60/+60
2011-12-22Merge branch 'nd/war-on-nul-in-commit'Junio C Hamano1-2/+2
2011-12-15Convert commit_tree() to take strbuf as messageNguyễn Thái Ngọc Duy1-2/+2
2011-12-13Convert resolve_ref+xstrdup to new resolve_refdup functionNguyễn Thái Ngọc Duy1-3/+4
2011-12-05Copy resolve_ref() return value for longer useNguyễn Thái Ngọc Duy1-1/+5
2011-05-19notes remove: --stdin reads from the standard inputJunio C Hamano1-4/+15
2011-05-19notes remove: --ignore-missingJunio C Hamano1-4/+10
2011-05-19notes remove: allow removing more than oneJunio C Hamano1-22/+25
2011-05-02Merge branch 'jk/notes-ui-updates'Junio C Hamano1-10/+0
2011-05-02Merge branch 'jh/notes-add-ui'Junio C Hamano1-3/+17
2011-04-01Merge branch 'ab/i18n-st'Junio C Hamano1-55/+57
2011-03-30Make "git notes add" more user-friendly when there are existing notesJohan Herland1-3/+17
2011-03-29notes: make expand_notes_ref globally accessibleJeff King1-10/+0
2011-03-22Fix sparse warningsStephen Boyd1-2/+2
2011-03-09i18n: git-notes GIT_NOTES_REWRITE_MODE error messageÆvar Arnfjörð Bjarmason1-2/+4
2011-03-09i18n: git-notes basic commandsÆvar Arnfjörð Bjarmason1-53/+53
2011-02-15Make <identifier> lowercase as per CodingGuidelinesMichael J Gruber1-8/+8
2010-12-08Merge branch 'jh/notes-merge'Junio C Hamano1-34/+234
2010-11-17Provide 'git notes get-ref' to easily retrieve current notes refJohan Herland1-0/+23
2010-11-17git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"Johan Herland1-2/+6
2010-11-17git notes merge: --commit should fail if underlying notes ref has movedJohan Herland1-2/+9
2010-11-17git notes merge: List conflicting notes in notes merge commit messageJohan Herland1-1/+1
2010-11-17git notes merge: Manual conflict resolution, part 2/2Johan Herland1-3/+103
2010-11-17git notes merge: Manual conflict resolution, part 1/2Johan Herland1-4/+4
2010-11-17git notes merge: Add automatic conflict resolvers (ours, theirs, union)Johan Herland1-1/+20
2010-11-17git notes merge: Handle real, non-conflicting notes mergesJohan Herland1-5/+10
2010-11-17builtin/notes.c: Refactor creation of notes commits.Johan Herland1-23/+5
2010-11-17git notes merge: Initial implementation handling trivial merges onlyJohan Herland1-0/+54
2010-11-17builtin/notes.c: Split notes ref DWIMmery into a separate functionJohan Herland1-6/+11
2010-11-17notes.h/c: Propagate combine_notes_fn return value to add_note() and beyondJohan Herland1-5/+6
2010-11-15add OPT__FORCERené Scharfe1-2/+2
2010-11-15add description parameter to OPT__DRY_RUNRené Scharfe1-2/+1
2010-11-15add description parameter to OPT__VERBOSERené Scharfe1-1/+1
2010-08-31notes: Don't create (empty) commit when removing non-existing notesJohan Herland1-4/+10
2010-08-09notes: allow --dry-run for -n and --verbose for -vRené Scharfe1-2/+3
2010-06-28Merge branch 'maint'Junio C Hamano1-0/+4
2010-06-28notes: check number of parameters to "git notes copy"Jeff King1-0/+4
2010-06-25Merge branch 'maint'Junio C Hamano1-1/+1
2010-06-24msvc: Fix some "expr evaluates to function" compiler warningsRamsay Jones1-1/+1
2010-06-16Merge 'maint' updates inJunio C Hamano1-1/+1
2010-06-15notes: Initialize variable to appease Sun StudioÆvar Arnfjörð Bjarmason1-1/+1
2010-05-19notes: dry-run and verbose options for pruneMichael J Gruber1-4/+9
2010-03-28Merge branch 'sb/notes-parse-opt'Junio C Hamano1-159/+371
2010-03-24Merge branch 'tr/notes-display'Junio C Hamano1-1/+196
2010-03-15Merge branch 'jh/notes'Junio C Hamano1-0/+455