Michael J Gruber  committed f5d4c4d

merge-options.txt: Clarify merge --squash

With the --squash option, merge sets up the index just like for a real
merge, but without the merge info (stages). Say so.

Signed-off-by: Michael J Gruber <>
Signed-off-by: Junio C Hamano <>

  • Participants
  • Parent commits f5b223a
  • Branches master

Comments (0)

Files changed (1)

File Documentation/merge-options.txt

 	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