Merge pull request libgit2#4109 from rcjsuen/patch-1

Edward Thomson · web-flow · commit be249bca1bb7 · 2017-02-08T10:21:55.000Z
Flag checkout_opts in git_reset as optional
diff --git a/include/git2/reset.h b/include/git2/reset.h
@@ -53,7 +53,7 @@ typedef enum {
  *
  * @param reset_type Kind of reset operation to perform.
  *
- * @param checkout_opts Checkout options to be used for a HARD reset.
+ * @param checkout_opts Optional checkout options to be used for a HARD reset.
  * The checkout_strategy field will be overridden (based on reset_type).
  * This parameter can be used to propagate notify and progress callbacks.
  *

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ typedef enum {`
`53`	`53`	`*`
`54`	`54`	`* @param reset_type Kind of reset operation to perform.`
`55`	`55`	`*`
`56`		`- * @param checkout_opts Checkout options to be used for a HARD reset.`
	`56`	`+ * @param checkout_opts Optional checkout options to be used for a HARD reset.`
`57`	`57`	`* The checkout_strategy field will be overridden (based on reset_type).`
`58`	`58`	`* This parameter can be used to propagate notify and progress callbacks.`
`59`	`59`	`*`