X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fmerge-options.txt;h=182cef54be5963ff0f32a24329ca195607413e29;hb=b9718d41c7e9c171e432bafac97a33be36f0e2bf;hp=53cc35590debbb7e4d7dfae536be19e59d038560;hpb=b642d9ef643371990c0a921836f2a074d48ce1b3;p=git.git

diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 53cc35590..182cef54b 100644
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -6,6 +6,14 @@
 	not autocommit, to give the user a chance to inspect and
 	further tweak the merge result before committing.
 
+--squash::
+	Produce the working tree and index state as if a real
+	merge happened, but do not actually make a commit or
+	move the `HEAD`, nor record `$GIT_DIR/MERGE_HEAD` to
+	cause the next `git commit` command to create a merge
+	commit.  This allows you to create a single commit on
+	top of the current branch whose effect is the same as
+	merging another branch (or more in case of an octopus).
 
 -s <strategy>, \--strategy=<strategy>::
 	Use the given merge strategy; can be supplied more than