diff options
author | Patrick Steinhardt <ps@pks.im> | 2019-12-13 08:53:51 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-12-13 08:53:51 +0100 |
commit | 3e6a9045213268089b567d7a6f7ccf30374b32b7 (patch) | |
tree | e481364ed023b190f496352e15ba49f6ba13466e | |
parent | b3178587ef4271fabe4a5e2168a5f3c95caf4188 (diff) | |
parent | 64e6db5b6eb26bfc41c4c2478728f4f3b0546b85 (diff) | |
download | libgit2-3e6a9045213268089b567d7a6f7ccf30374b32b7.tar.gz |
Merge pull request #5320 from josharian/minor-docs
Minor doc improvements
-rw-r--r-- | docs/changelog.md | 6 | ||||
-rw-r--r-- | include/git2/stash.h | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/docs/changelog.md b/docs/changelog.md index f52af8681..c75164901 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -84,8 +84,10 @@ v0.28 + 1 ### Changes or improvements -* libgit2 can now correctly cope with URLs where the host contains a colon - but a port is not specified. (eg `http://example.com:/repo.git`). +* libgit2 now correctly handles more URLs, such as + `http://example.com:/repo.git` (colon but no port), + `http://example.com` (no path), + and `http://example.com:8080/` (path is /, nonstandard port). * A carefully constructed commit object with a very large number of parents may lead to potential out-of-bounds writes or diff --git a/include/git2/stash.h b/include/git2/stash.h index 22448ccd6..625e51b4b 100644 --- a/include/git2/stash.h +++ b/include/git2/stash.h @@ -126,7 +126,7 @@ typedef int GIT_CALLBACK(git_stash_apply_progress_cb)( typedef struct git_stash_apply_options { unsigned int version; - /** See `git_stash_apply_flags_t`, above. */ + /** See `git_stash_apply_flags`, above. */ uint32_t flags; /** Options to use when writing files to the working directory. */ |