| commit | f5d4c4d0f19084a2d48f55f2f42cac25696a34f5 | |
| author | Michael J Gruber <git@drmicha.warpmail.net> | |
| Mon, 25 May 2009 16:00:10 +0000 (25 18:00 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 25 May 2009 18:23:18 +0000 (25 11:23 -0700) | ||
| tree | 63ce883e484cf53825ed061442db4a7c18f042f8 | treesnapshot (tar.gz zip) |
| parent | f5b223abfdc01455d42ed005b4fd9330b06c2967 | commitdiff |
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>
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>
| Documentation/merge-options.txt | diffblobblamehistory |