index
:
git.git
main
maint
master
next
seen
todo
The core git plumbing
Junio C. Hamano
about
summary
refs
log
tree
commit
diff
stats
log msg
author
committer
range
path:
root
/
notes-merge.c
Age
Commit message (
Expand
)
Author
Files
Lines
2024-05-07
cocci: apply rules to rewrite callers of "refs" interfaces
Patrick Steinhardt
1
-1
/
+1
2024-02-29
commit-reach(repo_get_merge_bases): pass on "missing commits" errors
Johannes Schindelin
1
-1
/
+2
2023-07-05
treewide: remove unnecessary includes for wrapper.h
Calvin Wan
1
-1
/
+0
2023-06-21
object-store-ll.h: split this header out of object-store.h
Elijah Newren
1
-1
/
+1
2023-06-21
merge-ll: rename from ll-merge
Elijah Newren
1
-1
/
+1
2023-06-21
repository: remove unnecessary include of path.h
Elijah Newren
1
-0
/
+1
2023-04-11
treewide: remove cache.h inclusion due to object-file.h changes
Elijah Newren
1
-1
/
+1
2023-04-11
object-file.h: move declarations for object-file.c functions from cache.h
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-11
treewide: be explicit about dependence on advice.h
Elijah Newren
1
-0
/
+1
2023-04-11
treewide: be explicit about dependence on trace.h & trace2.h
Elijah Newren
1
-0
/
+1
2023-04-04
Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-...
Junio C Hamano
1
-5
/
+6
2023-03-28
cocci: apply the "object-store.h" part of "the_repository.pending"
Ævar Arnfjörð Bjarmason
1
-1
/
+1
2023-03-28
cocci: apply the "commit.h" part of "the_repository.pending"
Ævar Arnfjörð Bjarmason
1
-2
/
+3
2023-03-28
cocci: apply the "commit-reach.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
-1
/
+1
2023-03-21
wrapper.h: move declarations for wrapper.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-02-23
cache.h: remove dependence on hex.h; make other files include it explicitly
Elijah Newren
1
-0
/
+1
2022-03-17
misc *.c: use designated initializers for struct assignments
Ævar Arnfjörð Bjarmason
1
-0
/
+1
2022-02-25
Merge branch 'ab/diff-free-more'
Junio C Hamano
1
-2
/
+0
2022-02-16
diff.[ch]: have diff_free() call clear_pathspec(opts.pathspec)
Ævar Arnfjörð Bjarmason
1
-2
/
+0
2022-02-02
ll-merge: make callers responsible for showing warnings
Elijah Newren
1
-1
/
+4
2021-08-25
advice: remove read uses of most global `advice_` variables
Ben Boeckel
1
-1
/
+1
2021-05-20
Merge branch 'en/dir-traversal'
Junio C Hamano
1
-4
/
+1
2021-05-13
dir: introduce readdir_skip_dot_and_dotdot() helper
Elijah Newren
1
-4
/
+1
2021-05-11
Merge branch 'js/merge-already-up-to-date-message-reword'
Junio C Hamano
1
-1
/
+1
2021-05-03
merge(s): apply consistent punctuation to "up to date" messages
Eric Sunshine
1
-1
/
+1
2021-04-27
hash: provide per-algorithm null OIDs
brian m. carlson
1
-1
/
+1
2021-03-13
use CALLOC_ARRAY
René Scharfe
1
-1
/
+1
2019-04-01
notes-merge: switch to use the_hash_algo
brian m. carlson
1
-3
/
+3
2019-01-14
notes-utils.c: remove the_repository references
Nguyễn Thái Ngọc Duy
1
-2
/
+2
2018-11-12
notes-merge.c: remove implicit dependency the_repository
Nguyễn Thái Ngọc Duy
1
-2
/
+2
2018-11-12
notes-merge.c: remove implicit dependency on the_index
Nguyễn Thái Ngọc Duy
1
-5
/
+7
2018-10-19
Merge branch 'nd/the-index'
Junio C Hamano
1
-4
/
+5
2018-09-21
sha1-file.c: remove implicit dependency on the_index
Nguyễn Thái Ngọc Duy
1
-1
/
+1
2018-09-21
ll-merge.c: remove implicit dependency on the_index
Nguyễn Thái Ngọc Duy
1
-1
/
+2
2018-09-21
diff.c: remove implicit dependency on the_index
Nguyễn Thái Ngọc Duy
1
-2
/
+2
2018-09-17
Merge branch 'jk/cocci'
Junio C Hamano
1
-12
/
+12
2018-08-29
convert "oidcmp() == 0" to oideq()
Jeff King
1
-12
/
+12
2018-07-20
commit.h: remove method declarations
Derrick Stolee
1
-0
/
+1
2018-06-29
commit: add repository argument to lookup_commit_reference
Stefan Beller
1
-2
/
+3
2018-06-29
Merge branch 'sb/object-store-grafts' into sb/object-store-lookup
Junio C Hamano
1
-0
/
+1
2018-05-30
Merge branch 'js/use-bug-macro'
Junio C Hamano
1
-2
/
+2
2018-05-23
Merge branch 'ds/lazy-load-trees'
Junio C Hamano
1
-4
/
+5
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
-2
/
+2
2018-04-11
treewide: replace maybe_tree with accessor methods
Derrick Stolee
1
-4
/
+5
2018-04-11
treewide: rename tree to maybe_tree
Derrick Stolee
1
-4
/
+4
2018-03-14
sha1_file: convert read_sha1_file to struct object_id
brian m. carlson
1
-1
/
+1
2018-01-30
commit: convert commit_tree* to object_id
Patryk Obara
1
-5
/
+4
2017-11-13
Switch empty tree and blob lookups to use hash abstraction
brian m. carlson
1
-1
/
+1
2017-11-09
Merge branch 'bw/diff-opt-impl-to-bitfields'
Junio C Hamano
1
-2
/
+2
2017-11-01
diff: make struct diff_flags members lowercase
Brandon Williams
1
-2
/
+2
2017-11-01
diff: remove DIFF_OPT_SET macro
Brandon Williams
1
-2
/
+2
2017-10-16
refs: convert read_ref and read_ref_full to object_id
brian m. carlson
1
-1
/
+1
2017-09-26
notes-merge: drop dead zero-write code
Jeff King
1
-2
/
+0
2017-09-25
Merge branch 'jk/write-in-full-fix'
Junio C Hamano
1
-1
/
+1
2017-09-14
notes-merge: use ssize_t for write_in_full() return value
Jeff King
1
-1
/
+1
2017-09-10
Merge branch 'ma/up-to-date'
Junio C Hamano
1
-1
/
+1
2017-08-23
treewide: correct several "up-to-date" to "up to date"
Martin Ågren
1
-1
/
+1
2017-08-20
sha1_file: convert index_path to struct object_id
Patryk Obara
1
-1
/
+1
2017-07-17
use MOVE_ARRAY
René Scharfe
1
-2
/
+1
2017-06-05
diff-tree: convert diff_tree_sha1 to struct object_id
Brandon Williams
1
-2
/
+2
2017-06-05
notes-merge: convert write_note_to_worktree to struct object_id
Brandon Williams
1
-10
/
+10
2017-06-05
notes-merge: convert verify_notes_filepair to struct object_id
Brandon Williams
1
-10
/
+10
2017-06-05
notes-merge: convert find_notes_merge_pair_ps to struct object_id
Brandon Williams
1
-12
/
+12
2017-06-05
notes-merge: convert merge_from_diffs to struct object_id
Brandon Williams
1
-15
/
+16
2017-06-05
notes-merge: convert notes_merge* to struct object_id
Brandon Williams
1
-29
/
+29
2017-06-02
notes: convert some accessor functions to struct object_id
brian m. carlson
1
-9
/
+9
2017-05-08
Convert lookup_commit* to struct object_id
brian m. carlson
1
-2
/
+2
2017-05-08
Convert remaining callers of lookup_commit_reference* to object_id
brian m. carlson
1
-13
/
+13
2017-04-20
replace strbuf_addstr(git_path()) with git_path_buf()
Jeff King
1
-2
/
+2
2016-09-26
Merge branch 'va/i18n-more'
Junio C Hamano
1
-4
/
+4
2016-09-21
i18n: notes-merge: mark die messages for translation
Vasco Almeida
1
-4
/
+4
2016-09-07
Convert read_mmblob to take struct object_id.
brian m. carlson
1
-3
/
+3
2016-09-07
notes-merge: convert struct notes_merge_pair to struct object_id
brian m. carlson
1
-62
/
+65
2016-07-28
Merge branch 'rs/notes-merge-no-toctou'
Junio C Hamano
1
-5
/
+1
2016-07-19
Merge branch 'bc/cocci'
Junio C Hamano
1
-21
/
+21
2016-07-07
notes-merge: use O_EXCL to avoid overwriting existing files
René Scharfe
1
-5
/
+1
2016-06-28
diff: convert struct diff_filespec to struct object_id
brian m. carlson
1
-21
/
+21
2016-06-02
pathspec: rename free_pathspec() to clear_pathspec()
Junio C Hamano
1
-2
/
+2
2015-11-20
Remove get_object_hash.
brian m. carlson
1
-10
/
+10
2015-11-20
Convert struct object to object_id
brian m. carlson
1
-2
/
+2
2015-11-20
Add several uses of get_object_hash.
brian m. carlson
1
-10
/
+10
2015-08-10
prefer git_pathdup to git_path in some possibly-dangerous cases
Jeff King
1
-1
/
+2
2015-05-11
Merge branch 'nd/multiple-work-trees'
Junio C Hamano
1
-3
/
+3
2015-01-07
Merge branch 'jc/merge-bases'
Junio C Hamano
1
-1
/
+1
2014-12-01
path.c: make get_pathname() call sites return const char *
Nguyễn Thái Ngọc Duy
1
-3
/
+3
2014-10-30
get_merge_bases(): always clean-up object flags
Junio C Hamano
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-06-13
commit: record buffer length in cache
Jeff King
1
-1
/
+1
2014-06-13
use get_commit_buffer everywhere
Jeff King
1
-1
/
+3
2014-06-12
replace dangerous uses of strbuf_attach
Jeff King
1
-4
/
+1
2014-06-12
commit_tree: take a pointer/len pair rather than a const strbuf
Jeff King
1
-2
/
+4
2013-07-15
remove diff_tree_{setup,release}_paths
Nguyễn Thái Ngọc Duy
1
-2
/
+2
2013-06-12
Move create_notes_commit() from notes-merge.c into notes-utils.c
Johan Herland
1
-26
/
+1
2012-08-22
Merge branch 'tr/void-diff-setup-done'
Junio C Hamano
1
-4
/
+2
2012-08-03
diff_setup_done(): return void
Thomas Rast
1
-4
/
+2
2012-06-07
notes-merge: remove i18n legos in merge result message
Nguyễn Thái Ngọc Duy
1
-2
/
+4
2012-03-15
notes-merge: Don't remove .git/NOTES_MERGE_WORKTREE; it may be the user's cwd
Johan Herland
1
-4
/
+9
2012-03-15
notes-merge: use opendir/readdir instead of using read_directory()
Johan Herland
1
-20
/
+30
2012-01-06
Merge branch 'jc/show-sig'
Junio C Hamano
1
-1
/
+1
2011-12-22
Merge branch 'nd/war-on-nul-in-commit'
Junio C Hamano
1
-4
/
+6
2011-12-15
Convert commit_tree() to take strbuf as message
Nguyễn Thái Ngọc Duy
1
-4
/
+6
2011-12-09
Merge branch 'nd/resolve-ref'
Junio C Hamano
1
-1
/
+1
2011-11-18
Sync with 1.7.7.4
Junio C Hamano
1
-43
/
+61
2011-11-18
Merge branch 'jn/maint-notes-avoid-va-args' into maint
Junio C Hamano
1
-43
/
+61
2011-11-17
notes merge: eliminate OUTPUT macro
Jonathan Nieder
1
-43
/
+61
2011-11-13
Convert many resolve_ref() calls to read_ref*() and ref_exists()
Nguyễn Thái Ngọc Duy
1
-1
/
+1
2011-11-12
commit: teach --gpg-sign option
Junio C Hamano
1
-1
/
+1
2011-10-10
Merge branch 'mh/maint-notes-merge-pathbuf-fix'
Junio C Hamano
1
-1
/
+2
2011-10-05
Change check_ref_format() to take a flags argument
Michael Haggerty
1
-2
/
+3
2011-09-27
notes_merge_commit(): do not pass temporary buffer to other function
Michael Haggerty
1
-1
/
+2
2011-05-09
index_fd(): turn write_object and format_check arguments into one flag
Junio C Hamano
1
-1
/
+1
2011-03-22
Fix sparse warnings
Stephen Boyd
1
-1
/
+1
2011-02-14
correct type of EMPTY_TREE_SHA1_BIN
Jonathan Nieder
1
-1
/
+1
2010-11-17
git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"
Johan Herland
1
-0
/
+7
2010-11-17
git notes merge: List conflicting notes in notes merge commit message
Johan Herland
1
-1
/
+10
2010-11-17
git notes merge: Manual conflict resolution, part 2/2
Johan Herland
1
-1
/
+70
2010-11-17
git notes merge: Manual conflict resolution, part 1/2
Johan Herland
1
-5
/
+161
2010-11-17
git notes merge: Add automatic conflict resolvers (ours, theirs, union)
Johan Herland
1
-1
/
+31
2010-11-17
git notes merge: Handle real, non-conflicting notes merges
Johan Herland
1
-3
/
+322
2010-11-17
builtin/notes.c: Refactor creation of notes commits.
Johan Herland
1
-0
/
+27
2010-11-17
git notes merge: Initial implementation handling trivial merges only
Johan Herland
1
-0
/
+120