aboutsummaryrefslogtreecommitdiff
path: root/builtin/notes.c
Commit message (Expand)AuthorAge
* Merge branch 'ot/pretty'Junio C Hamano2017-12-27
|\
| * format: create pretty.h fileOlga Telezhnaya2017-12-12
| * Merge branch 'tz/notes-error-to-stderr' into maintJunio C Hamano2017-12-06
| |\
* | \ Merge branch 'rd/doc-notes-prune-fix'Junio C Hamano2017-12-06
|\ \ \
| * | | notes: correct 'git notes prune' options to '[-n] [-v]'Robert P. J. Day2017-11-22
* | | | Merge branch 'tz/notes-error-to-stderr'Junio C Hamano2017-11-27
|\ \ \ \ | | |_|/ | |/| |
| * | | notes: send "Automatic notes merge failed" messages to stderrTodd Zullinger2017-11-15
| |/ /
* | | refs: rename constant `REF_NODEREF` to `REF_NO_DEREF`Michael Haggerty2017-11-06
* | | refs: convert resolve_refdup and refs_resolve_refdup to struct object_idbrian m. carlson2017-10-16
* | | refs: convert update_ref and refs_update_ref to use struct object_idbrian m. carlson2017-10-16
| |/ |/|
* | notes: release strbuf after use in notes_copy_from_stdin()Rene Scharfe2017-09-07
* | Merge branch 'bw/object-id'Junio C Hamano2017-08-11
|\ \
| * | notes: don't access hash of NULL object_id pointerRené Scharfe2017-07-17
* | | Merge branch 'bw/config-h'Junio C Hamano2017-06-24
|\ \ \
| * | | config: don't include config.h by defaultBrandon Williams2017-06-15
* | | | Merge branch 'bw/object-id'Junio C Hamano2017-06-19
|\ \ \ \ | | |/ / | |/| |
| * | | notes-merge: convert notes_merge* to struct object_idBrandon Williams2017-06-05
| * | | notes: convert some accessor functions to struct object_idbrian m. carlson2017-06-02
| * | | builtin/notes: convert to struct object_idbrian m. carlson2017-06-02
| * | | notes: make get_note return pointer to struct object_idbrian m. carlson2017-06-02
| * | | notes: convert for_each_note to struct object_idbrian m. carlson2017-06-02
* | | | Merge branch 'ab/c-translators-comment-style'Junio C Hamano2017-06-04
|\ \ \ \ | |/ / / |/| | |
| * | | C style: use standard style for "TRANSLATORS" commentsÆvar Arnfjörð Bjarmason2017-05-31
| |/ /
* | | Convert lookup_commit* to struct object_idbrian m. carlson2017-05-08
|/ /
* | replace unchecked snprintf calls with heap buffersJeff King2017-03-30
* | Merge branch 'bc/object-id'Junio C Hamano2017-03-17
|\ \
| * | Convert remaining callers of resolve_refdup to object_idbrian m. carlson2017-02-22
| |/
* | delete_ref: accept a reflog message argumentKyle Meyer2017-02-20
|/
* notes: spell first word of error messages in lowercaseVasco Almeida2016-09-15
* i18n: notes: mark error messages for translationVasco Almeida2016-09-15
* i18n: notes: mark comment for translationVasco Almeida2016-07-28
* i18n: notes: mark options for translationVasco Almeida2016-06-17
* i18n: notes: mark strings for translationVasco Almeida2016-06-17
* worktree.c: make find_shared_symref() return struct worktree *Nguyễn Thái Ngọc Duy2016-04-22
* Merge branch 'sb/misc-cleanups'Junio C Hamano2016-04-13
|\
| * notes: don't leak memory in git_config_get_notes_strategyStefan Beller2016-04-01
* | 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