Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Completion/Unix/Command/_git
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8312,10 +8312,10 @@ __git_setup_merge_options () {
'(--log )--no-log[do not list one-line descriptions of the commits being merged in the log message]'
'(-n --no-stat)--stat[show a diffstat at the end of the merge]'
'(--stat -n --no-stat)'{-n,--no-stat}'[do not show diffstat at the end of the merge]'
'( --no-squash)--squash[merge, but do not commit]'
'( --no-squash)--squash[prepare a squashed merge without committing]'
'--autostash[automatically stash/stash pop before and after]'
'--signoff[add Signed-off-by: trailer]'
'(--squash )--no-squash[merge and commit]'
'(--squash )--no-squash[do not prepare a squashed merge]'
'--ff-only[refuse to merge unless HEAD is up to date or merge can be resolved as a fast-forward]'
'(-S --gpg-sign --no-gpg-sign)'{-S-,--gpg-sign=-}'[GPG-sign the commit]::key id'
"(-S --gpg-sign --no-gpg-sign)--no-gpg-sign[don't GPG-sign the commit]"
Expand Down