summaryrefslogtreecommitdiff
path: root/include/git2
diff options
context:
space:
mode:
authorCarlos Martín Nieto <cmn@dwim.me>2014-10-10 17:40:53 +0200
committerCarlos Martín Nieto <cmn@dwim.me>2014-10-10 17:40:53 +0200
commit0625638f061589634df70a5c6b69818706375703 (patch)
tree5b621595d0689951b4424ae13d0379ef671bdfee /include/git2
parentf54d8d528a5843075c6c60167d4659e393956fa3 (diff)
parentb8add6c42ead8721c32dea8f473a61b48091ccb1 (diff)
downloadlibgit2-0625638f061589634df70a5c6b69818706375703.tar.gz
Merge pull request #2499 from csware/hard-reset-checkout-callbacks
Allow to propagate checkout callbacks to git HARD reset
Diffstat (limited to 'include/git2')
-rw-r--r--include/git2/reset.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/git2/reset.h b/include/git2/reset.h
index ea7217efe..5f2ba572d 100644
--- a/include/git2/reset.h
+++ b/include/git2/reset.h
@@ -52,6 +52,10 @@ typedef enum {
*
* @param reset_type Kind of reset operation to perform.
*
+ * @param checkout_opts 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.
+ *
* @param signature The identity that will used to populate the reflog entry
*
* @param log_message The one line long message to be appended to the reflog.
@@ -65,6 +69,7 @@ GIT_EXTERN(int) git_reset(
git_repository *repo,
git_object *target,
git_reset_t reset_type,
+ git_checkout_options *checkout_opts,
git_signature *signature,
const char *log_message);