diff options
| author | Michael J Gruber <git@drmicha.warpmail.net> | 2009-05-25 18:00:10 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-25 11:23:18 -0700 |
| commit | f5d4c4d0f19084a2d48f55f2f42cac25696a34f5 (patch) | |
| tree | 63ce883e484cf53825ed061442db4a7c18f042f8 /builtin.h | |
| parent | f5b223abfdc01455d42ed005b4fd9330b06c2967 (diff) | |
| download | git-f5d4c4d0f19084a2d48f55f2f42cac25696a34f5.tar.gz git-f5d4c4d0f19084a2d48f55f2f42cac25696a34f5.tar.xz | |
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>
Diffstat (limited to 'builtin.h')
0 files changed, 0 insertions, 0 deletions