| Age | Commit message (Expand) | Author | Files | Lines |
| 2025-08-21 | Merge branch 'jc/strbuf-split' | Junio C Hamano | 1 | -11/+12 |
| 2025-08-05 | Merge branch 'ps/object-file-wo-the-repository' | Junio C Hamano | 1 | -1/+2 |
| 2025-08-02 | notes: do not use strbuf_split*() | Junio C Hamano | 1 | -11/+12 |
| 2025-07-23 | config: drop `git_config_get_string()` wrapper | Patrick Steinhardt | 1 | -1/+1 |
| 2025-07-23 | config: drop `git_config()` wrapper | Patrick Steinhardt | 1 | -1/+1 |
| 2025-07-16 | odb: introduce `odb_write_object()` | Patrick Steinhardt | 1 | -1/+2 |
| 2025-07-01 | odb: rename `repo_read_object_file()` | Patrick Steinhardt | 1 | -3/+3 |
| 2025-07-01 | object-store: rename files to "odb.{c,h}" | Patrick Steinhardt | 1 | -1/+1 |
| 2025-04-15 | object-store: merge "object-store-ll.h" and "object-store.h" | Patrick Steinhardt | 1 | -1/+1 |
| 2025-04-15 | object-file: split out functions relating to object store subsystem | Patrick Steinhardt | 1 | -0/+1 |
| 2025-02-28 | path: drop `git_path()` in favor of `repo_git_path()` | Patrick Steinhardt | 1 | -1/+6 |
| 2025-02-07 | path: drop `git_pathdup()` in favor of `repo_git_path()` | Patrick Steinhardt | 1 | -1/+1 |
| 2024-11-26 | builtin: pass repository to sub commands | Karthik Nayak | 1 | -13/+23 |
| 2024-10-21 | notes: teach the -e option to edit messages in editor | Abraham Samuel Adekunle | 1 | -2/+6 |
| 2024-09-23 | Merge branch 'jc/pass-repo-to-builtins' | Junio C Hamano | 1 | -3/+6 |
| 2024-09-13 | builtin: remove USE_THE_REPOSITORY_VARIABLE from builtin.h | John Cai | 1 | -2/+2 |
| 2024-09-13 | builtin: add a repository parameter for builtin functions | John Cai | 1 | -1/+4 |
| 2024-09-12 | environment: stop storing "core.notesRef" globally | Patrick Steinhardt | 1 | -8/+14 |
| 2024-08-23 | Merge branch 'ps/config-wo-the-repository' | Junio C Hamano | 1 | -1/+1 |
| 2024-08-23 | Merge branch 'ps/leakfixes-part-4' | Junio C Hamano | 1 | -5/+4 |
| 2024-08-14 | builtin/notes: fix leaking `struct notes_tree` when merging notes | Patrick Steinhardt | 1 | -5/+4 |
| 2024-08-13 | config: pass repo to `git_die_config()` | Patrick Steinhardt | 1 | -1/+1 |
| 2024-07-29 | notes: do not trigger editor when adding an empty note | David Disseldorp | 1 | -12/+10 |
| 2024-06-14 | hash: require hash algorithm in `oidread()` and `oidclr()` | Patrick Steinhardt | 1 | -1/+1 |
| 2024-05-20 | Merge branch 'kn/ref-transaction-symref' | Junio C Hamano | 1 | -1/+1 |
| 2024-05-07 | cocci: apply rules to rewrite callers of "refs" interfaces | Patrick Steinhardt | 1 | -11/+15 |
| 2024-03-12 | strbuf: accept a comment string for strbuf_add_commented_lines() | Jeff King | 1 | -4/+4 |
| 2024-03-12 | strbuf: accept a comment string for strbuf_stripspace() | Jeff King | 1 | -2/+2 |
| 2024-02-14 | Merge branch 'js/check-null-from-read-object-file' | Junio C Hamano | 1 | -2/+4 |
| 2024-02-06 | Always check the return value of `repo_read_object_file()` | Johannes Schindelin | 1 | -2/+4 |
| 2023-12-26 | treewide: remove unnecessary includes in source files | Elijah Newren | 1 | -2/+0 |
| 2023-07-06 | Merge branch 'tl/notes-separator' | Junio C Hamano | 1 | -33/+126 |
| 2023-07-06 | Merge branch 'cw/strbuf-cleanup' | Junio C Hamano | 1 | -7/+9 |
| 2023-06-21 | object-store-ll.h: split this header out of object-store.h | Elijah Newren | 1 | -1/+1 |
| 2023-06-21 | repository: remove unnecessary include of path.h | Elijah Newren | 1 | -0/+1 |
| 2023-06-21 | cache.h: remove this no-longer-used header | Elijah Newren | 1 | -2/+1 |
| 2023-06-21 | notes: introduce "--no-separator" option | Teng Long | 1 | -10/+27 |
| 2023-06-21 | notes.c: introduce "--[no-]stripspace" option | Teng Long | 1 | -8/+22 |
| 2023-06-21 | notes.c: append separator instead of insert by pos | Teng Long | 1 | -9/+12 |
| 2023-06-21 | notes.c: introduce '--separator=<paragraph-break>' option | Teng Long | 1 | -24/+85 |
| 2023-06-21 | notes.c: use designated initializers for clarity | Teng Long | 1 | -2/+2 |
| 2023-06-21 | notes.c: cleanup 'strbuf_grow' call in 'append_edit' | Teng Long | 1 | -2/+0 |
| 2023-06-12 | strbuf: remove global variable | Calvin Wan | 1 | -7/+9 |
| 2023-04-11 | editor: move editor-related functions and declarations into common file | Elijah Newren | 1 | -0/+1 |
| 2023-04-11 | object-name.h: move declarations for object-name.c functions from cache.h | Elijah Newren | 1 | -0/+1 |
| 2023-04-06 | Merge branch 'en/header-split-cleanup' | Junio C Hamano | 1 | -0/+2 |
| 2023-04-06 | Merge branch 'ab/remove-implicit-use-of-the-repository' | Junio C Hamano | 1 | -16/+18 |
| 2023-04-04 | Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-... | Junio C Hamano | 1 | -16/+18 |
| 2023-03-28 | cocci: apply the "pretty.h" part of "the_repository.pending" | Ævar Arnfjörð Bjarmason | 1 | -1/+2 |
| 2023-03-28 | cocci: apply the "object-store.h" part of "the_repository.pending" | Ævar Arnfjörð Bjarmason | 1 | -3/+4 |
| 2023-03-28 | cocci: apply the "commit.h" part of "the_repository.pending" | Ævar Arnfjörð Bjarmason | 1 | -1/+1 |
| 2023-03-28 | cocci: apply the "cache.h" part of "the_repository.pending" | Ævar Arnfjörð Bjarmason | 1 | -11/+11 |
| 2023-03-21 | write-or-die.h: move declarations for write-or-die.c functions from cache.h | Elijah Newren | 1 | -0/+1 |
| 2023-03-21 | treewide: be explicit about dependence on gettext.h | Elijah Newren | 1 | -0/+1 |
| 2023-03-17 | Merge branch 'jk/unused-post-2.39-part2' | Junio C Hamano | 1 | -2/+3 |
| 2023-02-24 | notes: mark unused callback parameters | Jeff King | 1 | -2/+3 |
| 2023-02-23 | cache.h: remove dependence on hex.h; make other files include it explicitly | Elijah Newren | 1 | -0/+1 |
| 2022-11-16 | notes: avoid empty line in template | Michael J Gruber | 1 | -1/+1 |
| 2022-09-07 | notes, remote: show unknown subcommands between `' | SZEDER Gábor | 1 | -1/+1 |
| 2022-09-07 | notes: simplify default operation mode arguments check | SZEDER Gábor | 1 | -4/+7 |
| 2022-08-19 | builtin/notes.c: let parse-options parse subcommands | SZEDER Gábor | 1 | -26/+17 |
| 2022-03-16 | Merge branch 'ab/object-file-api-updates' | Junio C Hamano | 1 | -1/+1 |
| 2022-02-25 | object-file API: have write_object_file() take "enum object_type" | Ævar Arnfjörð Bjarmason | 1 | -1/+1 |
| 2022-02-04 | i18n: remove from i18n strings that do not hold translatable parts | Jean-Noël Avila | 1 | -3/+3 |
| 2022-01-10 | Merge branch 'ab/usage-die-message' | Junio C Hamano | 1 | -4/+5 |
| 2021-12-21 | Merge branch 'ak/protect-any-current-branch' | Junio C Hamano | 1 | -1/+5 |
| 2021-12-07 | usage.c API users: use die_message() for error() + exit 128 | Ævar Arnfjörð Bjarmason | 1 | -4/+5 |
| 2021-12-01 | worktree: simplify find_shared_symref() memory ownership model | Anders Kaseorg | 1 | -1/+5 |
| 2021-11-25 | run-command API users: use strvec_pushl(), not argv construction | Ævar Arnfjörð Bjarmason | 1 | -3/+2 |
| 2021-08-25 | use xopen() to handle fatal open(2) failures | René Scharfe | 1 | -3/+1 |
| 2021-03-13 | use CALLOC_ARRAY | René Scharfe | 1 | -1/+1 |
| 2021-02-23 | replace "parameters" by "arguments" in error messages | Johannes Sixt | 1 | -10/+10 |
| 2020-04-28 | Use OPT_CALLBACK and OPT_CALLBACK_F | Denton Liu | 1 | -16/+16 |
| 2020-02-10 | strbuf: add and use strbuf_insertstr() | René Scharfe | 1 | -2/+2 |
| 2019-10-18 | notes: fix minimum number of parameters to "copy" subcommand | Doan Tran Cong Danh | 1 | -1/+1 |
| 2019-01-14 | notes-utils.c: remove the_repository references | Nguyễn Thái Ngọc Duy | 1 | -8/+13 |
| 2019-01-04 | Merge branch 'nd/the-index' | Junio C Hamano | 1 | -1/+1 |
| 2018-11-18 | Merge branch 'cb/notes-freeing-always-null-fix' | Junio C Hamano | 1 | -3/+1 |
| 2018-11-13 | builtin/notes: remove unnecessary free | Carlo Marcelo Arenas Belón | 1 | -3/+1 |
| 2018-11-12 | notes-merge.c: remove implicit dependency on the_index | Nguyễn Thái Ngọc Duy | 1 | -1/+1 |
| 2018-11-06 | assert NOARG/NONEG behavior of parse-options callbacks | Jeff King | 1 | -0/+7 |
| 2018-06-29 | commit: add repository argument to lookup_commit_reference | Stefan Beller | 1 | -1/+2 |
| 2018-06-29 | Merge branch 'sb/object-store-grafts' into sb/object-store-lookup | Junio C Hamano | 1 | -0/+1 |
| 2018-06-01 | Merge branch 'nd/use-opt-int-set-f' | Junio C Hamano | 1 | -6/+6 |
| 2018-05-24 | Use OPT_SET_INT_F() for cmdline option specification | Nguyễn Thái Ngọc Duy | 1 | -6/+6 |
| 2018-05-16 | object-store: move object access functions to object-store.h | Stefan Beller | 1 | -0/+1 |
| 2018-05-06 | Replace all die("BUG: ...") calls by BUG() ones | Johannes Schindelin | 1 | -4/+4 |
| 2018-04-11 | exec_cmd: rename to use dash in file name | Stefan Beller | 1 | -1/+1 |
| 2018-04-10 | Merge branch 'bc/object-id' | Junio C Hamano | 1 | -7/+7 |
| 2018-03-14 | Merge branch 'nd/parseopt-completion' | Junio C Hamano | 1 | -2/+2 |
| 2018-03-14 | sha1_file: convert read_sha1_file to struct object_id | brian m. carlson | 1 | -3/+3 |
| 2018-03-14 | builtin/notes: convert static functions to object_id | brian m. carlson | 1 | -5/+5 |
| 2018-02-09 | completion: use __gitcomp_builtin in _git_notes | Nguyễn Thái Ngọc Duy | 1 | -2/+2 |
| 2018-02-09 | parse-options: let OPT__FORCE take optional flags argument | Nguyễn Thái Ngọc Duy | 1 | -2/+2 |
| 2018-01-30 | sha1_file: convert write_sha1_file to object_id | Patryk Obara | 1 | -4/+4 |
| 2017-12-27 | Merge branch 'ot/pretty' | Junio C Hamano | 1 | -1/+1 |
| 2017-12-12 | format: create pretty.h file | Olga Telezhnaya | 1 | -1/+1 |
| 2017-12-06 | Merge branch 'rd/doc-notes-prune-fix' | Junio C Hamano | 1 | -1/+1 |
| 2017-12-06 | Merge branch 'tz/notes-error-to-stderr' into maint | Junio C Hamano | 1 | -4/+4 |
| 2017-11-27 | Merge branch 'tz/notes-error-to-stderr' | Junio C Hamano | 1 | -4/+4 |
| 2017-11-22 | notes: correct 'git notes prune' options to '[-n] [-v]' | Robert P. J. Day | 1 | -1/+1 |
| 2017-11-15 | notes: send "Automatic notes merge failed" messages to stderr | Todd Zullinger | 1 | -4/+4 |
| 2017-11-06 | refs: rename constant `REF_NODEREF` to `REF_NO_DEREF` | Michael Haggerty | 1 | -1/+1 |
| 2017-10-16 | refs: convert resolve_refdup and refs_resolve_refdup to struct object_id | brian m. carlson | 1 | -1/+1 |
| 2017-10-16 | refs: convert update_ref and refs_update_ref to use struct object_id | brian m. carlson | 1 | -5/+5 |
| 2017-09-07 | notes: release strbuf after use in notes_copy_from_stdin() | Rene Scharfe | 1 | -0/+1 |
| 2017-08-11 | Merge branch 'bw/object-id' | Junio C Hamano | 1 | -1/+1 |
| 2017-07-17 | notes: don't access hash of NULL object_id pointer | René Scharfe | 1 | -1/+1 |
| 2017-06-24 | Merge branch 'bw/config-h' | Junio C Hamano | 1 | -0/+1 |
| 2017-06-19 | Merge branch 'bw/object-id' | Junio C Hamano | 1 | -68/+68 |
| 2017-06-15 | config: don't include config.h by default | Brandon Williams | 1 | -0/+1 |
| 2017-06-05 | notes-merge: convert notes_merge* to struct object_id | Brandon Williams | 1 | -3/+3 |
| 2017-06-04 | Merge branch 'ab/c-translators-comment-style' | Junio C Hamano | 1 | -2/+4 |
| 2017-06-02 | notes: convert some accessor functions to struct object_id | brian m. carlson | 1 | -10/+10 |
| 2017-06-02 | builtin/notes: convert to struct object_id | brian m. carlson | 1 | -55/+55 |
| 2017-06-02 | notes: make get_note return pointer to struct object_id | brian m. carlson | 1 | -11/+11 |
| 2017-06-02 | notes: convert for_each_note to struct object_id | brian m. carlson | 1 | -3/+3 |
| 2017-05-31 | C style: use standard style for "TRANSLATORS" comments | Ævar Arnfjörð Bjarmason | 1 | -2/+4 |
| 2017-05-08 | Convert lookup_commit* to struct object_id | brian m. carlson | 1 | -1/+1 |
| 2017-03-30 | replace unchecked snprintf calls with heap buffers | Jeff King | 1 | -5/+4 |
| 2017-03-17 | Merge branch 'bc/object-id' | Junio C Hamano | 1 | -9/+9 |
| 2017-02-22 | Convert remaining callers of resolve_refdup to object_id | brian m. carlson | 1 | -9/+9 |
| 2017-02-20 | delete_ref: accept a reflog message argument | Kyle Meyer | 1 | -2/+2 |
| 2016-09-15 | notes: spell first word of error messages in lowercase | Vasco Almeida | 1 | -32/+32 |
| 2016-09-15 | i18n: notes: mark error messages for translation | Vasco Almeida | 1 | -9/+11 |
| 2016-07-28 | i18n: notes: mark comment for translation | Vasco Almeida | 1 | -2/+3 |
| 2016-06-17 | i18n: notes: mark options for translation | Vasco Almeida | 1 | -2/+2 |
| 2016-06-17 | i18n: notes: mark strings for translation | Vasco Almeida | 1 | -10/+10 |
| 2016-04-22 | worktree.c: make find_shared_symref() return struct worktree * | Nguyễn Thái Ngọc Duy | 1 | -4/+4 |
| 2016-04-13 | Merge branch 'sb/misc-cleanups' | Junio C Hamano | 1 | -2/+3 |
| 2016-04-01 | notes: don't leak memory in git_config_get_notes_strategy | Stefan Beller | 1 | -2/+3 |
| 2016-02-03 | Merge branch 'jk/notes-merge-from-anywhere' | Junio C Hamano | 1 | -1/+1 |
| 2016-01-28 | Merge branch 'jc/strbuf-getline' | Junio C Hamano | 1 | -1/+1 |
| 2016-01-17 | notes: allow merging from arbitrary references | Jacob Keller | 1 | -1/+1 |
| 2016-01-15 | strbuf: introduce strbuf_getline_{lf,nul}() | Junio C Hamano | 1 | -1/+1 |
| 2016-01-12 | notes: allow treeish expressions as notes ref | Mike Hommey | 1 | -13/+16 |
| 2015-11-20 | Remove get_object_hash. | brian m. carlson | 1 | -1/+1 |
| 2015-11-20 | Add several uses of get_object_hash. | brian m. carlson | 1 | -1/+1 |
| 2015-10-26 | Merge branch 'tk/stripspace' | Junio C Hamano | 1 | -3/+3 |
| 2015-10-16 | strbuf: make stripspace() part of strbuf | Tobias Klauser | 1 | -3/+3 |
| 2015-10-02 | worktree: add top-level worktree.c | Michael Rappazzo | 1 | -1/+1 |
| 2015-08-31 | Merge branch 'jk/notes-merge-config' | Junio C Hamano | 1 | -13/+30 |
| 2015-08-25 | Merge branch 'dt/notes-multiple' | Junio C Hamano | 1 | -0/+6 |
| 2015-08-17 | notes: teach git-notes about notes.<name>.mergeStrategy option | Jacob Keller | 1 | -1/+13 |
| 2015-08-17 | notes: add notes.mergeStrategy option to select default strategy | Jacob Keller | 1 | -2/+17 |
| 2015-08-17 | notes: extract parse_notes_merge_strategy to notes-utils | Jacob Keller | 1 | -11/+1 |
| 2015-08-11 | notes: handle multiple worktrees | David Turner | 1 | -0/+6 |
| 2015-01-14 | standardize usage info string format | Alex Henrie | 1 | -12/+12 |
| 2014-11-12 | builtin/notes: add --allow-empty, to allow storing empty notes | Johan Herland | 1 | -6/+11 |
| 2014-11-12 | builtin/notes: split create_note() to clarify add vs. remove logic | Johan Herland | 1 | -49/+54 |
| 2014-11-12 | builtin/notes: simplify early exit code in add() | Johan Herland | 1 | -18/+17 |
| 2014-11-10 | builtin/notes: refactor note file path into struct note_data | Johan Herland | 1 | -17/+21 |
| 2014-11-10 | builtin/notes: improve naming | Johan Herland | 1 | -55/+54 |
| 2014-11-10 | builtin/notes: fix premature failure when trying to add the empty blob | Johan Herland | 1 | -1/+1 |
| 2014-10-15 | refs.c: change resolve_ref_unsafe reading argument to be a flags field | Ronnie Sahlberg | 1 | -1/+1 |
| 2014-09-19 | Merge branch 'ah/grammofix' | Junio C Hamano | 1 | -1/+1 |
| 2014-09-02 | grammofix in user-facing messages | Alex Henrie | 1 | -1/+1 |
| 2014-08-20 | run-command: introduce CHILD_PROCESS_INIT | René Scharfe | 1 | -2/+1 |
| 2014-06-03 | Merge branch 'mh/ref-transaction' | Junio C Hamano | 1 | -3/+3 |
| 2014-04-07 | refs.h: rename the action_on_err constants | Michael Haggerty | 1 | -3/+3 |
| 2014-03-24 | parse-options: multi-word argh should use dash to separate words | Junio C Hamano | 1 | -1/+1 |
| 2014-03-14 | Merge branch 'jh/note-trees-record-blobs' | Junio C Hamano | 1 | -1/+5 |
| 2014-02-20 | notes: disallow reusing non-blob as a note object | Johan Herland | 1 | -1/+5 |
| 2013-12-05 | replace {pre,suf}fixcmp() with {starts,ends}_with() | Christian Couder | 1 | -1/+1 |
| 2013-08-05 | Replace deprecated OPT_BOOLEAN by OPT_BOOL | Stefan Beller | 1 | -2/+2 |
| 2013-08-05 | Remove deprecated OPTION_BOOLEAN for parsing arguments | Stefan Beller | 1 | -4/+4 |
| 2013-06-26 | Merge branch 'ph/builtin-srcs-are-in-subdir-these-days' | Junio C Hamano | 1 | -1/+1 |
| 2013-06-18 | fix "builtin-*" references to be "builtin/*" | Phil Hord | 1 | -1/+1 |
| 2013-06-12 | Move copy_note_for_rewrite + friends from builtin/notes.c to notes-utils.c | Johan Herland | 1 | -130/+1 |
| 2013-06-12 | finish_copy_notes_for_rewrite(): Let caller provide commit message | Johan Herland | 1 | -4/+5 |
| 2013-01-16 | Allow custom "comment char" | Junio C Hamano | 1 | -19/+15 |
| 2012-09-15 | builtin/notes.c: mark file-scope private symbols as static | Junio C Hamano | 1 | -2/+5 |
| 2012-08-22 | Reduce translations by using same terminologies | Nguyễn Thái Ngọc Duy | 1 | -2/+2 |
| 2012-08-20 | i18n: notes: mark parseopt strings for translation | Nguyễn Thái Ngọc Duy | 1 | -60/+60 |
| 2011-12-22 | Merge branch 'nd/war-on-nul-in-commit' | Junio C Hamano | 1 | -2/+2 |
| 2011-12-15 | Convert commit_tree() to take strbuf as message | Nguyễn Thái Ngọc Duy | 1 | -2/+2 |
| 2011-12-13 | Convert resolve_ref+xstrdup to new resolve_refdup function | Nguyễn Thái Ngọc Duy | 1 | -3/+4 |
| 2011-12-05 | Copy resolve_ref() return value for longer use | Nguyễn Thái Ngọc Duy | 1 | -1/+5 |
| 2011-05-19 | notes remove: --stdin reads from the standard input | Junio C Hamano | 1 | -4/+15 |
| 2011-05-19 | notes remove: --ignore-missing | Junio C Hamano | 1 | -4/+10 |
| 2011-05-19 | notes remove: allow removing more than one | Junio C Hamano | 1 | -22/+25 |
| 2011-05-02 | Merge branch 'jk/notes-ui-updates' | Junio C Hamano | 1 | -10/+0 |
| 2011-05-02 | Merge branch 'jh/notes-add-ui' | Junio C Hamano | 1 | -3/+17 |
| 2011-04-01 | Merge branch 'ab/i18n-st' | Junio C Hamano | 1 | -55/+57 |
| 2011-03-30 | Make "git notes add" more user-friendly when there are existing notes | Johan Herland | 1 | -3/+17 |
| 2011-03-29 | notes: make expand_notes_ref globally accessible | Jeff King | 1 | -10/+0 |
| 2011-03-22 | Fix sparse warnings | Stephen Boyd | 1 | -2/+2 |
| 2011-03-09 | i18n: git-notes GIT_NOTES_REWRITE_MODE error message | Ævar Arnfjörð Bjarmason | 1 | -2/+4 |
| 2011-03-09 | i18n: git-notes basic commands | Ævar Arnfjörð Bjarmason | 1 | -53/+53 |
| 2011-02-15 | Make <identifier> lowercase as per CodingGuidelines | Michael J Gruber | 1 | -8/+8 |
| 2010-12-08 | Merge branch 'jh/notes-merge' | Junio C Hamano | 1 | -34/+234 |
| 2010-11-17 | Provide 'git notes get-ref' to easily retrieve current notes ref | Johan Herland | 1 | -0/+23 |
| 2010-11-17 | git notes merge: Add another auto-resolving strategy: "cat_sort_uniq" | Johan Herland | 1 | -2/+6 |
| 2010-11-17 | git notes merge: --commit should fail if underlying notes ref has moved | Johan Herland | 1 | -2/+9 |
| 2010-11-17 | git notes merge: List conflicting notes in notes merge commit message | Johan Herland | 1 | -1/+1 |
| 2010-11-17 | git notes merge: Manual conflict resolution, part 2/2 | Johan Herland | 1 | -3/+103 |
| 2010-11-17 | git notes merge: Manual conflict resolution, part 1/2 | Johan Herland | 1 | -4/+4 |
| 2010-11-17 | git notes merge: Add automatic conflict resolvers (ours, theirs, union) | Johan Herland | 1 | -1/+20 |
| 2010-11-17 | git notes merge: Handle real, non-conflicting notes merges | Johan Herland | 1 | -5/+10 |
| 2010-11-17 | builtin/notes.c: Refactor creation of notes commits. | Johan Herland | 1 | -23/+5 |