]> git.ipfire.org Git - thirdparty/git.git/commit - ll-merge.h
merge: move doc to ll-merge.h
authorHeba Waly <heba.waly@gmail.com>
Sun, 17 Nov 2019 21:04:43 +0000 (21:04 +0000)
committerJunio C Hamano <gitster@pobox.com>
Mon, 18 Nov 2019 06:21:28 +0000 (15:21 +0900)
commitd3d7172e4002a360b8a463363968593cfb261dbe
tree78885e77c4443ba630ce0051af9dc70fb3d7c82f
parent3f1480b745b70e9f7c0629b58a98ddcb516490bb
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>
Documentation/technical/api-merge.txt
ll-merge.h