Merge remote-tracking branch 'upstream/master' into next

1 files changed, 5 insertions, 0 deletions

diff --git a/checkout.go b/checkout.go
index ce2f469..a2e312b 100644
--- a/checkout.go
+++ b/checkout.go
@@ -45,6 +45,7 @@ type CheckoutOpts struct {
 	FileOpenFlags   int              // Default is O_CREAT | O_TRUNC | O_WRONLY
 	TargetDirectory string           // Alternative checkout path to workdir
 	Paths           []string
+	Baseline        *Tree
 }
 
 func checkoutOptionsFromC(c *C.git_checkout_options) CheckoutOpts {
@@ -90,6 +91,10 @@ func populateCheckoutOpts(ptr *C.git_checkout_options, opts *CheckoutOpts) *C.gi
 		ptr.paths.count = C.size_t(len(opts.Paths))
 	}
 
+	if opts.Baseline != nil {
+		ptr.baseline = opts.Baseline.cast_ptr
+	}
+
 	return ptr
 }