__ __ __ __ _____ _ _ _____ _ _ _ | \/ | \ \ / / | __ \ (_) | | / ____| | | | | | \ / |_ __\ V / | |__) | __ ___ ____ _| |_ ___ | (___ | |__ ___| | | | |\/| | '__|> < | ___/ '__| \ \ / / _` | __/ _ \ \___ \| '_ \ / _ \ | | | | | | |_ / . \ | | | | | |\ V / (_| | || __/ ____) | | | | __/ | | |_| |_|_(_)_/ \_\ |_| |_| |_| \_/ \__,_|\__\___| |_____/|_| |_|\___V 2.1 if you need WebShell for Seo everyday contact me on Telegram Telegram Address : @jackleetFor_More_Tools:
merge API ========= The merge API helps a program to reconcile two competing sets of improvements to some files (e.g., unregistered changes from the work tree versus changes involved in switching to a new branch), reporting conflicts if found. The library called through this API is responsible for a few things. * determining which trees to merge (recursive ancestor consolidation); * lining up corresponding files in the trees to be merged (rename detection, subtree shifting), reporting edge cases like add/add and rename/rename conflicts to the user; * performing a three-way merge of corresponding files, taking path-specific merge drivers (specified in `.gitattributes`) into account. Data structures --------------- * `mmbuffer_t`, `mmfile_t` These store data usable for use by the xdiff backend, for writing and for reading, respectively. See `xdiff/xdiff.h` for the definitions and `diff.c` for examples. * `struct ll_merge_options` Check merge-ll.h for details. Low-level (single file) merge ----------------------------- Check merge-ll.h for details.
| Name | Type | Size | Permission | Actions |
|---|---|---|---|---|
| api-error-handling.adoc | File | 3.73 KB | 0644 |
|
| api-error-handling.html | File | 35.21 KB | 0644 |
|
| api-index-skel.adoc | File | 432 B | 0644 |
|
| api-index.adoc | File | 689 B | 0644 |
|
| api-index.html | File | 30.43 KB | 0644 |
|
| api-index.sh | File | 714 B | 0644 |
|
| api-merge.adoc | File | 1.06 KB | 0644 |
|
| api-merge.html | File | 31.51 KB | 0644 |
|
| api-parse-options.adoc | File | 13.01 KB | 0644 |
|
| api-parse-options.html | File | 49.44 KB | 0644 |
|
| api-path-walk.adoc | File | 3.27 KB | 0644 |
|
| api-path-walk.html | File | 34.28 KB | 0644 |
|
| api-simple-ipc.adoc | File | 4.74 KB | 0644 |
|
| api-simple-ipc.html | File | 35.49 KB | 0644 |
|
| api-trace2.adoc | File | 43.45 KB | 0644 |
|
| api-trace2.html | File | 86.12 KB | 0644 |
|
| bitmap-format.adoc | File | 14.66 KB | 0644 |
|
| bitmap-format.html | File | 49.31 KB | 0644 |
|
| build-systems.adoc | File | 7.96 KB | 0644 |
|
| build-systems.html | File | 41.02 KB | 0644 |
|
| bundle-uri.adoc | File | 26.12 KB | 0644 |
|
| bundle-uri.html | File | 63.08 KB | 0644 |
|
| commit-graph.adoc | File | 17.7 KB | 0644 |
|
| commit-graph.html | File | 52.61 KB | 0644 |
|
| directory-rename-detection.adoc | File | 5.08 KB | 0644 |
|
| directory-rename-detection.html | File | 36.33 KB | 0644 |
|
| hash-function-transition.adoc | File | 35.45 KB | 0644 |
|
| hash-function-transition.html | File | 75.42 KB | 0644 |
|
| large-object-promisors.adoc | File | 26.59 KB | 0644 |
|
| large-object-promisors.html | File | 62.72 KB | 0644 |
|
| long-running-process-protocol.adoc | File | 1.88 KB | 0644 |
|
| long-running-process-protocol.html | File | 32.18 KB | 0644 |
|
| meson.build | File | 1.49 KB | 0644 |
|
| multi-pack-index.adoc | File | 11.31 KB | 0644 |
|
| multi-pack-index.html | File | 44.62 KB | 0644 |
|
| pack-heuristics.adoc | File | 17.62 KB | 0644 |
|
| pack-heuristics.html | File | 54.83 KB | 0644 |
|
| packfile-uri.adoc | File | 3.66 KB | 0644 |
|
| packfile-uri.html | File | 34.64 KB | 0644 |
|
| parallel-checkout.adoc | File | 12.01 KB | 0644 |
|
| parallel-checkout.html | File | 44.27 KB | 0644 |
|
| partial-clone.adoc | File | 14.59 KB | 0644 |
|
| partial-clone.html | File | 48.96 KB | 0644 |
|
| platform-support.adoc | File | 8.95 KB | 0644 |
|
| platform-support.html | File | 40.71 KB | 0644 |
|
| racy-git.adoc | File | 8.91 KB | 0644 |
|
| racy-git.html | File | 41.04 KB | 0644 |
|
| reftable.adoc | File | 36.65 KB | 0644 |
|
| reftable.html | File | 86.46 KB | 0644 |
|
| remembering-renames.adoc | File | 29.71 KB | 0644 |
|
| remembering-renames.html | File | 65.78 KB | 0644 |
|
| repository-version.adoc | File | 3.19 KB | 0644 |
|
| repository-version.html | File | 33.92 KB | 0644 |
|
| rerere.adoc | File | 6.36 KB | 0644 |
|
| rerere.html | File | 38.33 KB | 0644 |
|
| scalar.adoc | File | 2.87 KB | 0644 |
|
| scalar.html | File | 33.61 KB | 0644 |
|
| send-pack-pipeline.adoc | File | 1.92 KB | 0644 |
|
| send-pack-pipeline.html | File | 32.41 KB | 0644 |
|
| shallow.adoc | File | 2.49 KB | 0644 |
|
| shallow.html | File | 32.77 KB | 0644 |
|
| sparse-checkout.adoc | File | 46.68 KB | 0644 |
|
| sparse-checkout.html | File | 92.36 KB | 0644 |
|
| sparse-index.adoc | File | 9.28 KB | 0644 |
|
| sparse-index.html | File | 41.79 KB | 0644 |
|
| trivial-merge.adoc | File | 4.16 KB | 0644 |
|
| trivial-merge.html | File | 35.33 KB | 0644 |
|
| unit-tests.adoc | File | 9.8 KB | 0644 |
|
| unit-tests.html | File | 50.73 KB | 0644 |
|