aboutsummaryrefslogtreecommitdiffstats
path: root/options.go
diff options
context:
space:
mode:
Diffstat (limited to 'options.go')
-rw-r--r--options.go7
1 files changed, 7 insertions, 0 deletions
diff --git a/options.go b/options.go
index 635a883..6a7963f 100644
--- a/options.go
+++ b/options.go
@@ -89,6 +89,13 @@ type CloneOptions struct {
Shared bool
}
+// MergeOptions describes how a merge should be erformed
+type MergeOptions struct {
+ // Requires a merge to be fast forward only. If this is true, then a merge will
+ // throw an error if ff is not possible.
+ FFOnly bool
+}
+
// Validate validates the fields and sets the default values.
func (o *CloneOptions) Validate() error {
if o.URL == "" {