summaryrefslogtreecommitdiff
path: root/builtin/notes.c
Commit message (Expand)AuthorAgeFilesLines
* replace unchecked snprintf calls with heap buffersJeff King2017-03-301-5/+4
* Merge branch 'bc/object-id'Junio C Hamano2017-03-171-9/+9
|\
| * Convert remaining callers of resolve_refdup to object_idbrian m. carlson2017-02-221-9/+9
* | delete_ref: accept a reflog message argumentKyle Meyer2017-02-201-2/+2
|/
* notes: spell first word of error messages in lowercaseVasco Almeida2016-09-151-32/+32
* i18n: notes: mark error messages for translationVasco Almeida2016-09-151-9/+11
* i18n: notes: mark comment for translationVasco Almeida2016-07-281-2/+3
* i18n: notes: mark options for translationVasco Almeida2016-06-171-2/+2
* i18n: notes: mark strings for translationVasco Almeida2016-06-171-10/+10
* worktree.c: make find_shared_symref() return struct worktree *Nguyễn Thái Ngọc Duy2016-04-221-4/+4
* Merge branch 'sb/misc-cleanups'Junio C Hamano2016-04-131-2/+3
|\
| * notes: don't leak memory in git_config_get_notes_strategyStefan Beller2016-04-011-2/+3
* | Merge branch 'jk/notes-merge-from-anywhere'Junio C Hamano2016-02-031-1/+1
|\ \
| * | notes: allow merging from arbitrary referencesjk/notes-merge-from-anywhereJacob Keller2016-01-171-1/+1
| |/
* | Merge branch 'jc/strbuf-getline'Junio C Hamano2016-01-281-1/+1
|\ \
| * | strbuf: introduce strbuf_getline_{lf,nul}()Junio C Hamano2016-01-151-1/+1
| |/
* | notes: allow treeish expressions as notes refmh/notes-allow-reading-treeishMike Hommey2016-01-121-13/+16
|/
* Remove get_object_hash.brian m. carlson2015-11-201-1/+1
* Add several uses of get_object_hash.brian m. carlson2015-11-201-1/+1
* Merge branch 'tk/stripspace'Junio C Hamano2015-10-261-3/+3
|\
| * strbuf: make stripspace() part of strbufTobias Klauser2015-10-161-3/+3
* | worktree: add top-level worktree.cMichael Rappazzo2015-10-021-1/+1
|/
* Merge branch 'jk/notes-merge-config'Junio C Hamano2015-08-311-13/+30
|\
| * notes: teach git-notes about notes.<name>.mergeStrategy optionjk/notes-merge-configJacob Keller2015-08-171-1/+13
| * notes: add notes.mergeStrategy option to select default strategyJacob Keller2015-08-171-2/+17
| * notes: extract parse_notes_merge_strategy to notes-utilsJacob Keller2015-08-171-11/+1
* | Merge branch 'dt/notes-multiple'Junio C Hamano2015-08-251-0/+6
|\ \ | |/ |/|
| * notes: handle multiple worktreesdt/notes-multipleDavid Turner2015-08-111-0/+6
* | standardize usage info string formatAlex Henrie2015-01-141-12/+12
* | builtin/notes: add --allow-empty, to allow storing empty notesJohan Herland2014-11-121-6/+11
* | builtin/notes: split create_note() to clarify add vs. remove logicJohan Herland2014-11-121-49/+54
* | builtin/notes: simplify early exit code in add()Johan Herland2014-11-121-18/+17
* | builtin/notes: refactor note file path into struct note_dataJohan Herland2014-11-101-17/+21
* | builtin/notes: improve namingJohan Herland2014-11-101-55/+54
* | builtin/notes: fix premature failure when trying to add the empty blobJohan Herland2014-11-101-1/+1
|/
* refs.c: change resolve_ref_unsafe reading argument to be a flags fieldRonnie Sahlberg2014-10-151-1/+1
* Merge branch 'ah/grammofix'Junio C Hamano2014-09-191-1/+1
|\
| * grammofix in user-facing messagesah/grammofixAlex Henrie2014-09-021-1/+1
* | run-command: introduce CHILD_PROCESS_INITRené Scharfe2014-08-201-2/+1
|/
* Merge branch 'mh/ref-transaction'Junio C Hamano2014-06-031-3/+3
|\
| * refs.h: rename the action_on_err constantsMichael Haggerty2014-04-071-3/+3
* | parse-options: multi-word argh should use dash to separate wordsJunio C Hamano2014-03-241-1/+1
|/
* Merge branch 'jh/note-trees-record-blobs'Junio C Hamano2014-03-141-1/+5
|\
| * notes: disallow reusing non-blob as a note objectjh/note-trees-record-blobsJohan Herland2014-02-201-1/+5
* | replace {pre,suf}fixcmp() with {starts,ends}_with()cc/starts-n-ends-withChristian Couder2013-12-051-1/+1
* | Replace deprecated OPT_BOOLEAN by OPT_BOOLStefan Beller2013-08-051-2/+2
* | Remove deprecated OPTION_BOOLEAN for parsing argumentsStefan Beller2013-08-051-4/+4
|/
* Merge branch 'ph/builtin-srcs-are-in-subdir-these-days'Junio C Hamano2013-06-261-1/+1
|\
| * fix "builtin-*" references to be "builtin/*"Phil Hord2013-06-181-1/+1
* | Move copy_note_for_rewrite + friends from builtin/notes.c to notes-utils.cJohan Herland2013-06-121-130/+1
View Lorry Controller Status