Use increment setting value if it's set and the command line option i…

…sn't supplied.

Sources/ReleaseTools/OptionParser.swift

@@ -167,14 +167,16 @@ class OptionParser {
     }
 
     // remember the commit counting setting if it was supplied
-    if let buildOptions {
-      // ... on the command line
-      incrementBuildTag = buildOptions.incrementTag
-    } else if let setting = getDefault(for: "increment-tag") {
-      // ... or as a default setting
+    if let setting = getDefault(for: "increment-tag") {
+      // ... as a default setting
       incrementBuildTag = setting == "true"
     }
 
+    if let buildOptions, buildOptions.incrementTag {
+      // ... a true value on the command line takes precedence
+      incrementBuildTag = true
+    }
+
     // if we've specified the scheme or user, we also need the workspace
     if requirements.contains(.workspace) || scheme != nil || user != nil {
       if let workspace = options.workspace ?? defaultWorkspace {