bybrooklyn/zsh
1
0
Fork 0
mirror of https://git.code.sf.net/p/zsh/code synced 2026-04-18 06:53:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Elliot Berman
2025-08-20 18:01:35 -07:00
committed by Oliver Kiddle
parent 5ee53bb245
commit c45baa2510
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Completion/Unix/Command/_git
View File

@@ -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]"