From f5d4c4d0f19084a2d48f55f2f42cac25696a34f5 Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Mon, 25 May 2009 18:00:10 +0200 Subject: 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 diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt index 637b53f..adadf8e 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 -- cgit v0.10.2-6-g49f6