diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2019-12-01 14:11:56 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-01 14:11:56 +1100 |
| commit | d298f9b2879170612dff7512c8c20e64baad69d1 (patch) | |
| tree | c9c19065699e8f962e1b64c4a8e08fb65de5fadf /include/git2 | |
| parent | 7f6fdb8293a94267fead2424c90450de228db157 (diff) | |
| parent | b7cf4b9e481273becdfc785b6b1f3569a636a8bf (diff) | |
| download | libgit2-d298f9b2879170612dff7512c8c20e64baad69d1.tar.gz | |
Merge pull request #5315 from kastiglione/dl/fix-copypaste-in-git_cherrypick_commit-docstring
Fix copy&paste in git_cherrypick_commit docstring
Diffstat (limited to 'include/git2')
| -rw-r--r-- | include/git2/cherrypick.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/git2/cherrypick.h b/include/git2/cherrypick.h index 81784b4c8..0e6a252e6 100644 --- a/include/git2/cherrypick.h +++ b/include/git2/cherrypick.h @@ -59,8 +59,8 @@ GIT_EXTERN(int) git_cherrypick_options_init( * @param out pointer to store the index result in * @param repo the repository that contains the given commits * @param cherrypick_commit the commit to cherry-pick - * @param our_commit the commit to revert against (eg, HEAD) - * @param mainline the parent of the revert commit, if it is a merge + * @param our_commit the commit to cherry-pick against (eg, HEAD) + * @param mainline the parent of the `cherrypick_commit`, if it is a merge * @param merge_options the merge options (or null for defaults) * @return zero on success, -1 on failure. */ |