Linux evo.fastest-server.com 5.14.0-284.1101.el9.tuxcare.11.els11.x86_64 #1 SMP PREEMPT_DYNAMIC Fri Aug 14 13:30:35 UTC 2026 x86_64
LiteSpeed
Server IP : 103.249.112.113 & Your IP : 216.73.217.135
Domains : 988 Domain
User : tanishks
Terminal
Auto Root
Create File
Create Folder
Localroot Suggester
Backdoor Destroyer
Readme
/
usr /
share /
doc /
git /
technical /
Delete
Unzip
Name
Size
Permission
Date
Action
api-error-handling.adoc
3.73
KB
-rw-r--r--
2025-11-17 16:38
api-error-handling.html
35.21
KB
-rw-r--r--
2026-04-05 23:58
api-index-skel.adoc
432
B
-rw-r--r--
2025-11-17 16:38
api-index.adoc
689
B
-rw-r--r--
2026-04-05 23:58
api-index.html
30.43
KB
-rw-r--r--
2026-04-05 23:59
api-index.sh
714
B
-rw-r--r--
2025-11-17 16:38
api-merge.adoc
1.06
KB
-rw-r--r--
2025-11-17 16:38
api-merge.html
31.51
KB
-rw-r--r--
2026-04-05 23:58
api-parse-options.adoc
13.01
KB
-rw-r--r--
2025-11-17 16:38
api-parse-options.html
49.44
KB
-rw-r--r--
2026-04-05 23:58
api-path-walk.adoc
3.27
KB
-rw-r--r--
2025-11-17 16:38
api-path-walk.html
34.28
KB
-rw-r--r--
2026-04-05 23:58
api-simple-ipc.adoc
4.74
KB
-rw-r--r--
2025-11-17 16:38
api-simple-ipc.html
35.49
KB
-rw-r--r--
2026-04-05 23:58
api-trace2.adoc
43.45
KB
-rw-r--r--
2025-11-17 16:38
api-trace2.html
86.12
KB
-rw-r--r--
2026-04-05 23:58
bitmap-format.adoc
14.66
KB
-rw-r--r--
2025-11-17 16:38
bitmap-format.html
49.31
KB
-rw-r--r--
2026-04-05 23:58
build-systems.adoc
7.96
KB
-rw-r--r--
2025-11-17 16:38
build-systems.html
41.02
KB
-rw-r--r--
2026-04-05 23:58
bundle-uri.adoc
26.12
KB
-rw-r--r--
2025-11-17 16:38
bundle-uri.html
63.08
KB
-rw-r--r--
2026-04-05 23:58
commit-graph.adoc
17.7
KB
-rw-r--r--
2025-11-17 16:38
commit-graph.html
52.61
KB
-rw-r--r--
2026-04-05 23:58
directory-rename-detection.adoc
5.08
KB
-rw-r--r--
2025-11-17 16:38
directory-rename-detection.html
36.33
KB
-rw-r--r--
2026-04-05 23:58
hash-function-transition.adoc
35.45
KB
-rw-r--r--
2025-11-17 16:38
hash-function-transition.html
75.42
KB
-rw-r--r--
2026-04-05 23:58
large-object-promisors.adoc
26.59
KB
-rw-r--r--
2025-11-17 16:38
large-object-promisors.html
62.72
KB
-rw-r--r--
2026-04-05 23:58
long-running-process-protocol.adoc
1.88
KB
-rw-r--r--
2025-11-17 16:38
long-running-process-protocol.html
32.18
KB
-rw-r--r--
2026-04-05 23:58
meson.build
1.49
KB
-rw-r--r--
2025-11-17 16:38
multi-pack-index.adoc
11.31
KB
-rw-r--r--
2025-11-17 16:38
multi-pack-index.html
44.62
KB
-rw-r--r--
2026-04-05 23:58
pack-heuristics.adoc
17.62
KB
-rw-r--r--
2025-11-17 16:38
pack-heuristics.html
54.83
KB
-rw-r--r--
2026-04-05 23:58
packfile-uri.adoc
3.66
KB
-rw-r--r--
2025-11-17 16:38
packfile-uri.html
34.64
KB
-rw-r--r--
2026-04-05 23:58
parallel-checkout.adoc
12.01
KB
-rw-r--r--
2025-11-17 16:38
parallel-checkout.html
44.27
KB
-rw-r--r--
2026-04-05 23:58
partial-clone.adoc
14.59
KB
-rw-r--r--
2025-11-17 16:38
partial-clone.html
48.96
KB
-rw-r--r--
2026-04-05 23:58
platform-support.adoc
8.95
KB
-rw-r--r--
2025-11-17 16:38
platform-support.html
40.71
KB
-rw-r--r--
2026-04-05 23:58
racy-git.adoc
8.91
KB
-rw-r--r--
2025-11-17 16:38
racy-git.html
41.04
KB
-rw-r--r--
2026-04-05 23:58
reftable.adoc
36.65
KB
-rw-r--r--
2025-11-17 16:38
reftable.html
86.46
KB
-rw-r--r--
2026-04-05 23:58
remembering-renames.adoc
29.71
KB
-rw-r--r--
2025-11-17 16:38
remembering-renames.html
65.78
KB
-rw-r--r--
2026-04-05 23:58
repository-version.adoc
3.19
KB
-rw-r--r--
2025-11-17 16:38
repository-version.html
33.92
KB
-rw-r--r--
2026-04-05 23:58
rerere.adoc
6.36
KB
-rw-r--r--
2025-11-17 16:38
rerere.html
38.33
KB
-rw-r--r--
2026-04-05 23:58
scalar.adoc
2.87
KB
-rw-r--r--
2025-11-17 16:38
scalar.html
33.61
KB
-rw-r--r--
2026-04-05 23:58
send-pack-pipeline.adoc
1.92
KB
-rw-r--r--
2025-11-17 16:38
send-pack-pipeline.html
32.41
KB
-rw-r--r--
2026-04-05 23:58
shallow.adoc
2.49
KB
-rw-r--r--
2025-11-17 16:38
shallow.html
32.77
KB
-rw-r--r--
2026-04-05 23:58
sparse-checkout.adoc
46.68
KB
-rw-r--r--
2025-11-17 16:38
sparse-checkout.html
92.36
KB
-rw-r--r--
2026-04-05 23:58
sparse-index.adoc
9.28
KB
-rw-r--r--
2025-11-17 16:38
sparse-index.html
41.79
KB
-rw-r--r--
2026-04-05 23:58
trivial-merge.adoc
4.16
KB
-rw-r--r--
2025-11-17 16:38
trivial-merge.html
35.33
KB
-rw-r--r--
2026-04-05 23:58
unit-tests.adoc
9.8
KB
-rw-r--r--
2025-11-17 16:38
unit-tests.html
50.73
KB
-rw-r--r--
2026-04-05 23:58
Save
Rename
Trivial merge rules =================== This document describes the outcomes of the trivial merge logic in read-tree. One-way merge ------------- This replaces the index with a different tree, keeping the stat info for entries that don't change, and allowing -u to make the minimum required changes to the working tree to have it match. Entries marked '+' have stat information. Spaces marked '*' don't affect the result. index tree result ----------------------- * (empty) (empty) (empty) tree tree index+ tree tree index+ index index+ Two-way merge ------------- It is permitted for the index to lack an entry; this does not prevent any case from applying. If the index exists, it is an error for it not to match either the old or the result. If multiple cases apply, the one used is listed first. A result which changes the index is an error if the index is not empty and not up to date. Entries marked '+' have stat information. Spaces marked '*' don't affect the result. case index old new result ------------------------------------- 0/2 (empty) * (empty) (empty) 1/3 (empty) * new new 4/5 index+ (empty) (empty) index+ 6/7 index+ (empty) index index+ 10 index+ index (empty) (empty) 14/15 index+ old old index+ 18/19 index+ old index index+ 20 index+ index new new Three-way merge --------------- It is permitted for the index to lack an entry; this does not prevent any case from applying. If the index exists, it is an error for it not to match either the head or (if the merge is trivial) the result. If multiple cases apply, the one used is listed first. A result of "no merge" means that index is left in stage 0, ancest in stage 1, head in stage 2, and remote in stage 3 (if any of these are empty, no entry is left for that stage). Otherwise, the given entry is left in stage 0, and there are no other entries. A result of "no merge" is an error if the index is not empty and not up to date. *empty* means that the tree must not have a directory-file conflict with the entry. For multiple ancestors, a '+' means that this case applies even if only one ancestor or remote fits; a '^' means all of the ancestors must be the same. case ancest head remote result ---------------------------------------- 1 (empty)+ (empty) (empty) (empty) 2ALT (empty)+ *empty* remote remote 2 (empty)^ (empty) remote no merge 3ALT (empty)+ head *empty* head 3 (empty)^ head (empty) no merge 4 (empty)^ head remote no merge 5ALT * head head head 6 ancest+ (empty) (empty) no merge 8 ancest^ (empty) ancest no merge 7 ancest+ (empty) remote no merge 10 ancest^ ancest (empty) no merge 9 ancest+ head (empty) no merge 16 anc1/anc2 anc1 anc2 no merge 13 ancest+ head ancest head 14 ancest+ ancest remote remote 11 ancest+ head remote no merge Only #2ALT and #3ALT use *empty*, because these are the only cases where there can be conflicts that didn't exist before. Note that we allow directory-file conflicts between things in different stages after the trivial merge. A possible alternative for #6 is (empty), which would make it like #1. This is not used, due to the likelihood that it arises due to moving the file to multiple different locations or moving and deleting it in different branches. Case #1 is included for completeness, and also in case we decide to put on '+' markings; any path that is never mentioned at all isn't handled. Note that #16 is when both #13 and #14 apply; in this case, we refuse the trivial merge, because we can't tell from this data which is right. This is a case of a reverted patch (in some direction, maybe multiple times), and the right answer depends on looking at crossings of history or common ancestors of the ancestors. Note that, between #6, #7, #9, and #11, all cases not otherwise covered are handled in this table. For #8 and #10, there is alternative behavior, not currently implemented, where the result is (empty). As currently implemented, the automatic merge will generally give this effect.