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 <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael J Gruber committed
May 25, 2009 at 18:00 UTC
f5d4c4d0f19084a2d48f55f2f42cac25696a34f5
1 file changed
+2
-1
Documentation/merge-options.txt
+2
-1
@@ -39,7 +39,8 @@
39
40
--squash::
41
Produce the working tree and index state as if a real
42
- merge happened, but do not actually make a commit or
42
+ merge happened (except for the merge information),
43
+ but do not actually make a commit or
44
move the `HEAD`, nor record `$GIT_DIR/MERGE_HEAD` to
45
cause the next `git commit` command to create a merge
46
commit. This allows you to create a single commit on