1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-18 19:26:07 +02:00
git/Documentation/technical
Heba Waly d3d7172e40 merge: move doc to ll-merge.h
Move the related documentation from Documentation/technical/api-merge.txt
to ll-merge.h as it's easier for the developers to find the usage
information beside the code instead of looking for it in another doc file.

Only the ll-merge related doc is removed from
documentation/technical/api-merge.txt because this information will be
redundant and it'll be hard to keep it up to date and synchronized with
the documentation in ll-merge.h.

Signed-off-by: Heba Waly <heba.waly@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-11-18 15:21:28 +09:00
..
.gitignore
api-allocation-growing.txt
api-argv-array.txt api-argv-array.txt: remove broken link to string-list API 2017-10-06 21:16:03 +09:00
api-config.txt Documentation/technical/api-config.txt: fix formatting 2019-04-01 15:17:47 +09:00
api-credentials.txt
api-error-handling.txt
api-gitattributes.txt Documentation: spelling and grammar fixes 2018-06-22 14:26:23 -07:00
api-index-skel.txt
api-index.sh
api-merge.txt merge: move doc to ll-merge.h 2019-11-18 15:21:28 +09:00
api-oid-array.txt sha1-array: provide oid_array_filter 2018-12-05 11:42:31 +09:00
api-parse-options.txt parse-options: make OPT_ARGUMENT() more useful 2019-03-18 11:44:14 +09:00
api-ref-iteration.txt doc: typo: s/can not/cannot/ and s/is does/does/ 2019-08-05 10:05:24 -07:00
api-remote.txt
api-revision-walking.txt revision.c: remove implicit dependency on the_index 2018-09-21 09:51:19 -07:00
api-run-command.txt
api-setup.txt
api-sigchain.txt
api-submodule-config.txt Merge branch 'sb/submodule-move-nested' 2018-05-08 15:59:17 +09:00
api-trace.txt
api-trace2.txt trace2: write discard message to sentinel files 2019-10-05 17:53:51 +09:00
api-tree-walking.txt tree-walk: add a strbuf wrapper for make_traverse_path() 2019-08-01 13:06:52 -07:00
bitmap-format.txt
commit-graph-format.txt commit-graph: add base graphs chunk 2019-06-19 20:46:26 -07:00
commit-graph.txt commit-graph: create options for split files 2019-06-19 20:46:26 -07:00
directory-rename-detection.txt Merge branch 'ja/dir-rename-doc-markup-fix' 2019-04-10 02:14:21 +09:00
hash-function-transition.txt doc: fix repeated words 2019-08-11 17:40:07 -07:00
http-protocol.txt doc: fix want-capability separator 2018-07-30 11:25:20 -07:00
index-format.txt ieot: add Index Entry Offset Table (IEOT) extension 2018-10-11 15:32:48 +09:00
long-running-process-protocol.txt Docs: split out long-running subprocess handshake 2018-01-25 11:24:32 -08:00
multi-pack-index.txt multi-pack-index: add design document 2018-07-12 13:55:02 -07:00
pack-format.txt midx: write object offsets 2018-07-20 11:27:28 -07:00
pack-heuristics.txt
pack-protocol.txt fix pack protocol example client/server communication 2019-03-18 14:37:54 +09:00
partial-clone.txt partial-clone: add multiple remotes in the doc 2019-06-25 14:05:37 -07:00
protocol-capabilities.txt protocol-capabilities.txt: document symref 2019-02-21 12:05:52 -08:00
protocol-common.txt
protocol-v2.txt doc: fix repeated words 2019-08-11 17:40:07 -07:00
racy-git.txt
repository-version.txt doc: move extensions.worktreeConfig to the right place 2018-11-16 14:10:31 +09:00
rerere.txt rerere: mention caveat about unmatched conflict markers 2018-08-29 08:54:11 -07:00
send-pack-pipeline.txt
shallow.txt technical/shallow: describe why shallow cannot use replace refs 2018-04-30 11:12:31 +09:00
signature-format.txt
trivial-merge.txt