X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fmerge-options.txt;h=adadf8e4bf309a2fd2ec8efbeff09b410ca7b041;hb=ebfbdb340ad9a1b6fbaf91464f0fd86643fdcb46;hp=637b53f898829af98153d60953434fa30e3df179;hpb=cc137194519a8ddbc0514da088fb012bea40df51;p=git.git

diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 637b53f89..adadf8e4b 100644
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -39,7 +39,8 @@
 
 --squash::
 	Produce the working tree and index state as if a real
-	merge happened, but do not actually make a commit or
+	merge happened (except for the merge information),
+	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