Completion: _git: Fix text for git merge --squash/--no-squash

[elliotberman]

No description provided.

[okdana]

the current wording is paraphrasing git-merge(1):

--squash
--no-squash

Produce the working tree and index state as if a real merge happened (except for the merge information), but do not actually make a commit, move the HEAD, or 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 top of the current branch whose effect is the same as merging another branch (or more in case of an octopus).

With --no-squash perform the merge and commit the result. This option can be used to override --squash.

With --squash, --commit is not allowed, and will fail.

as it says, --squash doesn't actually create a commit. it's usually building up to one, but it doesn't produce it itself

people would probably get what you mean but i'm not sure it's clearer or more accurate than it was

maybe someone else has an opinion

[larryv]

people would probably get what you mean but i'm not sure it's clearer or more accurate than it was

I think that, at a glance, the proposed text appears to describe the opposite of the actual behavior. I have a hard time seeing how a typical reader could interpret it otherwise.

maybe someone else has an opinion

My opinion is that we should not accept this change.

[elliotberman]

Right, I see your perspectives here.

I think the current text as-is is still confusing -- it doesn't reflect the "squash" nature and only discusses whether or not a subsequent git commit is needed. I'd originally interpreted the text as being a typo/mismatch with --(no-)commit.

How about:
--squash: Prepare a squashed merge without committing.
--no-squash: Do not prepare of a squashed merge