summaryrefslogtreecommitdiff
path: root/Documentation/technical/api-merge.txt
AgeCommit message (Expand)Author
2019-11-18merge: move doc to ll-merge.hHeba Waly
2012-06-08docs: fix cross-directory linkgit referencesJeff King
2012-06-04doc: fix xref link from api docs to manual pagesJunio C Hamano
2010-08-26ll-merge: replace flag argument with options structJonathan Nieder
2010-08-06ll-merge: make flag easier to populateJonathan Nieder
2010-08-06Documentation/technical: document ll_mergeJonathan Nieder