mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-02 10:01:11 +02:00
Code Releases Activity

41808: _git-cherry-pick: Typo fixes

Browse source
This commit is contained in:
Noah Pendleton 2017-10-04 22:07:18 +00:00 committed by Daniel Shahaf
parent e573857a03
commit 63271a4b93
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2017-10-04 Noah Pendleton <noah.pendleton@gmail.com>
* 41808: Completion/Unix/Command/_git: _git-cherry-pick:
Typo fixes
2017-10-04 Peter Stephenson <p.stephenson@samsung.com>
* 41802 (minor tweaks): Src/exec.c, Src/parse.c: use heap

4
Completion/Unix/Command/_git
View file

@ -519,11 +519,11 @@ _git-cherry-pick () {
'--allow-empty[preserve initially empty commits]' \
'--allow-empty-message[allow replaying a commit with an empty message]' \
'--keep-redundant-commits[keep cherry-picked commits that will become empty]' \
'(-e --edit --ff)'{-e,--edit}'[edit commit before committing the revert]' \
'(-e --edit --ff)'{-e,--edit}'[edit commit before committing the cherry-pick]' \
'(--ff)-x[append information about what commit was cherry-picked]' \
'(-m --mainline)'{-m+,--mainline=}'[specify mainline when cherry-picking a merge commit]:parent number' \
'--rerere-autoupdate[update index with reused conflict resolution if possible]' \
'(-n --no-commit --ff)'{-n,--no-commit}'[do not make the actually commit]' \
'(-n --no-commit --ff)'{-n,--no-commit}'[do not make the actual commit]' \
'(-s --signoff --ff)'{-s,--signoff}'[add Signed-off-by line at the end of the commit message]' \
'(-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]" \