index
:
git
master
git
Fast-forward packages
summary
refs
log
tree
commit
diff
stats
log msg
author
committer
range
path:
root
/
merge-ort.c
(
follow
)
Commit message (
Expand
)
Author
Age
Files
Lines
...
*
|
|
read-cache*.h: move declarations for read-cache.c functions from cache.h
Elijah Newren
2023-06-21
1
-0
/
+1
*
|
|
sparse-index.h: move declarations for sparse-index.c from cache.h
Elijah Newren
2023-06-21
1
-0
/
+1
|
/
/
*
|
Merge branch 'en/header-split-cache-h-part-2'
Junio C Hamano
2023-05-10
1
-0
/
+1
|
\
\
|
*
|
match-trees.h: move declarations for match-trees.c functions from cache.h
Elijah Newren
2023-04-24
1
-0
/
+1
*
|
|
Merge branch 'en/ort-finalize-after-0-merges-fix'
Junio C Hamano
2023-05-02
1
-4
/
+4
|
\
\
\
|
|
/
/
|
/
|
|
|
*
|
merge-ort: fix calling merge_finalize() with no intermediate merge
Elijah Newren
2023-04-24
1
-4
/
+4
*
|
|
object-name.h: move declarations for object-name.c functions from cache.h
Elijah Newren
2023-04-11
1
-0
/
+1
*
|
|
treewide: be explicit about dependence on mem-pool.h
Elijah Newren
2023-04-11
1
-0
/
+1
*
|
|
treewide: be explicit about dependence on oid-array.h
Elijah Newren
2023-04-11
1
-0
/
+1
*
|
|
treewide: be explicit about dependence on trace.h & trace2.h
Elijah Newren
2023-04-11
1
-0
/
+1
*
|
|
Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-...
Junio C Hamano
2023-04-04
1
-3
/
+3
|
\
\
\
|
*
|
|
cocci: apply the "promisor-remote.h" part of "the_repository.pending"
Ævar Arnfjörð Bjarmason
2023-03-28
1
-1
/
+1
|
*
|
|
cocci: apply the "object-store.h" part of "the_repository.pending"
Ævar Arnfjörð Bjarmason
2023-03-28
1
-1
/
+1
|
*
|
|
cocci: apply the "commit-reach.h" part of "the_repository.pending"
Ævar Arnfjörð Bjarmason
2023-03-28
1
-1
/
+1
*
|
|
|
environment.h: move declarations for environment.c functions from cache.h
Elijah Newren
2023-03-21
1
-0
/
+1
*
|
|
|
treewide: be explicit about dependence on gettext.h
Elijah Newren
2023-03-21
1
-0
/
+1
*
|
|
|
cache.h: remove dependence on hex.h; make other files include it explicitly
Elijah Newren
2023-02-24
1
-0
/
+1
|
/
/
/
*
|
|
Merge branch 'en/ort-dir-rename-and-symlink-fix'
Taylor Blau
2022-10-31
1
-2
/
+34
|
\
\
\
|
*
|
|
merge-ort: fix bug with dir rename vs change dir to symlink
Elijah Newren
2022-10-23
1
-2
/
+34
|
|
/
/
*
|
|
Merge branch 'jk/unused-anno-more'
Junio C Hamano
2022-10-27
1
-1
/
+1
|
\
\
\
|
|
/
/
|
/
|
|
|
*
|
string-list: mark unused callback parameters
Jeff King
2022-10-18
1
-1
/
+1
*
|
|
merge-ort: return early when failing to write a blob
Johannes Schindelin
2022-09-28
1
-9
/
+19
*
|
|
merge-ort: fix segmentation fault in read-only repositories
Johannes Schindelin
2022-09-28
1
-25
/
+41
|
/
/
*
|
Merge branch 'en/ort-unused-code-removal'
Junio C Hamano
2022-08-29
1
-20
/
+2
|
\
\
|
*
|
merge-ort: remove code obsoleted by other changes
Elijah Newren
2022-08-19
1
-20
/
+2
*
|
|
Merge branch 'en/submodule-merge-messages-fixes'
Junio C Hamano
2022-08-25
1
-9
/
+116
|
\
\
\
|
|
/
/
|
/
|
|
|
*
|
merge-ort: provide helpful submodule update message when possible
Elijah Newren
2022-08-18
1
-11
/
+7
|
*
|
merge-ort: avoid surprise with new sub_flag variable
Elijah Newren
2022-08-18
1
-1
/
+1
|
*
|
merge-ort: remove translator lego in new "submodule conflict suggestion"
Elijah Newren
2022-08-18
1
-60
/
+28
|
*
|
submodule merge: update conflict error message
Calvin Wan
2022-08-04
1
-9
/
+152
*
|
|
Merge branch 'js/ort-clean-up-after-failed-merge'
Junio C Hamano
2022-08-08
1
-0
/
+5
|
\
\
\
|
|
/
/
|
/
|
|
|
*
|
merge-ort: do leave trace2 region even if checkout fails
Johannes Schindelin
2022-08-01
1
-0
/
+3
|
*
|
merge-ort: clean up after failed merge
Johannes Schindelin
2022-08-01
1
-0
/
+2
*
|
|
Merge branch 'en/merge-dual-dir-renames-fix'
Junio C Hamano
2022-07-18
1
-26
/
+48
|
\
\
\
|
*
|
|
merge-ort: fix issue with dual rename and add/add conflict
Elijah Newren
2022-07-06
1
-1
/
+7
|
*
|
|
merge-ort: shuffle the computation and cleanup of potential collisions
Elijah Newren
2022-07-06
1
-5
/
+15
|
*
|
|
merge-ort: make a separate function for freeing struct collisions
Elijah Newren
2022-07-06
1
-16
/
+22
|
*
|
|
merge-ort: small cleanups of check_for_directory_rename
Elijah Newren
2022-07-06
1
-6
/
+6
*
|
|
|
merge-ort: optionally produce machine-readable output
Elijah Newren
2022-06-23
1
-2
/
+20
*
|
|
|
merge-ort: store more specific conflict information
Elijah Newren
2022-06-23
1
-55
/
+212
*
|
|
|
merge-ort: make `path_messages` a strmap to a string_list
Johannes Schindelin
2022-06-23
1
-33
/
+1
*
|
|
|
merge-ort: store messages in a list, not in a single strbuf
Johannes Schindelin
2022-06-23
1
-43
/
+80
*
|
|
|
merge-ort: remove command-line-centric submodule message from merge-ort
Elijah Newren
2022-06-23
1
-8
/
+1
*
|
|
|
merge-ort: provide a merge_get_conflicted_files() helper function
Elijah Newren
2022-06-23
1
-0
/
+31
*
|
|
|
merge-ort: split out a separate display_update_messages() function
Elijah Newren
2022-06-23
1
-37
/
+41
*
|
|
|
Merge branch 'ab/plug-leak-in-revisions'
Junio C Hamano
2022-06-07
1
-0
/
+1
|
\
\
\
\
|
*
|
|
|
revisions API users: add straightforward release_revisions()
Ævar Arnfjörð Bjarmason
2022-04-14
1
-0
/
+1
|
|
/
/
/
*
|
|
|
Merge branch 'ep/maint-equals-null-cocci'
Junio C Hamano
2022-05-21
1
-2
/
+2
|
\
\
\
\
|
|
/
/
/
|
/
|
|
|
|
*
|
|
Merge branch 'ep/maint-equals-null-cocci' for maint-2.35
Junio C Hamano
2022-05-02
1
-2
/
+2
|
|
\
\
\
|
|
|
/
/
|
|
/
|
|
|
|
*
|
tree-wide: apply equals-null.cocci
Junio C Hamano
2022-05-02
1
-2
/
+2
[prev]
[next]