Update from treeverse/lakeFS@418fc9f

assets/js/swagger.yml

@@ -686,7 +686,15 @@ components:
           type: boolean
           default: false
           description: Allow merge when the branches have the same content
-
+        squash_merge:
+          type: boolean
+          default: true
+          description: |
+            If set, set only the destination branch as a parent, which "squashes" the merge to
+            appear as a single commit on the destination branch.  The source commit is no longer
+            a part of the merge commit; consider adding it to the 'metadata' or 'message'
+            fields.  This behaves like a GitHub or GitLab "squash merge", or in Git terms 'git
+            merge --squash; git commit ...'.
     BranchCreation:
       type: object
       required:

reference/cli.html

@@ -3984,6 +3984,7 @@ <h4 class="no_toc" id="options-103">
   -h, --help                  help for merge
   -m, --message string        commit message
       --meta strings          key value pair in the form of key=value
+      --squash                Squash all changes from source into a single commit on destination
       --strategy string       In case of a merge conflict, this option will force the merge process to automatically favor changes from the dest branch ("dest-wins") or from the source branch("source-wins"). In case no selection is made, the merge process will fail in case of a conflict
 </code></pre></div></div>
 <h3 id="lakectl-metastore">