diff --git a/docs/api/main.json b/docs/api/main.json index 1abfa50fb5..0ab185f116 100644 --- a/docs/api/main.json +++ b/docs/api/main.json @@ -1,7 +1,6 @@ { "info": { - "version": "main", - "commit": "c6111ec06cc0b0126cd67bdab78f8091e4cfaa10" + "commit": "4f0def867e4df60a19e54ece3ed1e5dc45dd6ce8" }, "groups": { "sys/alloc": { @@ -25316,7 +25315,7 @@ "name": "git_merge_bases_many", "location": { "file": "merge.h", - "line": 480, + "line": 511, "column": 17 }, "returns": { @@ -25350,7 +25349,13 @@ } ], "comment": [ - "Find all merge bases given a list of commits" + "Find all merge bases given a list of commits", + "This behaves similar to [`git merge-base`](https://git-scm.com/docs/git-merge-base#_discussion).", + "Given three commits `a`, `b`, and `c`, `merge_base_many`\n will compute a hypothetical commit `m`, which is a merge between `b`\n and `c`.", + "For example, with the following topology:\n ```text\n o---o---o---o---C\n /\n / o---o---o---B\n / /\n ---2---1---o---o---o---A\n ```", + "the result of `merge_base_many` given `a`, `b`, and `c` is 1. This is\n because the equivalent topology with the imaginary merge commit `m`\n between `b` and `c` is:\n ```text\n o---o---o---o---o\n / \n\\\n / o---o---o---o---M\n / /\n ---2---1---o---o---o---A\n ```", + "and the result of `merge_base_many` given `a` and `m` is 1.", + "If you're looking to recieve the common ancestor between all the\n given commits, use `merge_base_octopus`." ], "group": "merge" }, @@ -25359,7 +25364,7 @@ "name": "git_merge_base_octopus", "location": { "file": "merge.h", - "line": 495, + "line": 526, "column": 17 }, "returns": { @@ -25402,7 +25407,7 @@ "name": "git_merge_file", "location": { "file": "merge.h", - "line": 517, + "line": 548, "column": 17 }, "returns": { @@ -25452,7 +25457,7 @@ "name": "git_merge_file_from_index", "location": { "file": "merge.h", - "line": 538, + "line": 569, "column": 17 }, "returns": { @@ -25507,7 +25512,7 @@ "name": "git_merge_file_result_free", "location": { "file": "merge.h", - "line": 551, + "line": 582, "column": 18 }, "returns": { @@ -25531,7 +25536,7 @@ "name": "git_merge_trees", "location": { "file": "merge.h", - "line": 569, + "line": 600, "column": 17 }, "returns": { @@ -25587,7 +25592,7 @@ "name": "git_merge_commits", "location": { "file": "merge.h", - "line": 592, + "line": 623, "column": 17 }, "returns": { @@ -25637,7 +25642,7 @@ "name": "git_merge", "location": { "file": "merge.h", - "line": 617, + "line": 648, "column": 17 }, "returns": { diff --git a/docs/reference/index.html b/docs/reference/index.html index a4151707eb..8f119d6c69 100644 --- a/docs/reference/index.html +++ b/docs/reference/index.html @@ -923,913 +923,3 @@

System Groups (Advanced)

---- -title: APIs (libgit2 main) -layout: default ---- - -
-
-

libgit2 main

-
- Version: - -
-
- -

Groups

- - -

System Groups (Advanced)

- -
diff --git a/docs/reference/main/.metadata b/docs/reference/main/.metadata index 7d2b7b4b20..006db0d082 100644 --- a/docs/reference/main/.metadata +++ b/docs/reference/main/.metadata @@ -1,4 +1,3 @@ { - "version": "main", - "commit": "c6111ec06cc0b0126cd67bdab78f8091e4cfaa10" + "commit": "4f0def867e4df60a19e54ece3ed1e5dc45dd6ce8" } diff --git a/docs/reference/main/apply/GIT_APPLY_OPTIONS_INIT.html b/docs/reference/main/apply/GIT_APPLY_OPTIONS_INIT.html new file mode 100644 index 0000000000..69afc53bb4 --- /dev/null +++ b/docs/reference/main/apply/GIT_APPLY_OPTIONS_INIT.html @@ -0,0 +1,197 @@ +--- +title: GIT_APPLY_OPTIONS_INIT (libgit2 main) +layout: default +--- + +
+
+ +
+
+

GIT_APPLY_OPTIONS_INIT

+
+ Version: + +
+
+ +

Signature

+ +
+ #define GIT_APPLY_OPTIONS_INIT {GIT_APPLY_OPTIONS_VERSION}
+

Versions

+
+ +
+
diff --git a/docs/reference/main/apply/git_apply_options_init.html b/docs/reference/main/apply/git_apply_options_init.html index 69afc53bb4..0539be5419 100644 --- a/docs/reference/main/apply/git_apply_options_init.html +++ b/docs/reference/main/apply/git_apply_options_init.html @@ -1,196 +1,220 @@ --- -title: GIT_APPLY_OPTIONS_INIT (libgit2 main) +title: git_apply_options_init (libgit2 main) layout: default --- -
-
+
+ -
-

GIT_APPLY_OPTIONS_INIT

-
+
+

git_apply_options_init

+
Version:
-

Signature

-