diff options
| author | Noah Pendleton <noah.pendleton@gmail.com> | 2017-10-04 22:07:18 +0000 |
|---|---|---|
| committer | Daniel Shahaf <d.s@daniel.shahaf.name> | 2017-10-04 22:07:23 +0000 |
| commit | 63271a4b9308a3965a0f0a97175cbcfdf1a3b813 (patch) | |
| tree | 1a72614b3df5cc4fe725b8aab2f870fe7fad4499 | |
| parent | e573857a033504f7918c4a2309151329820f115f (diff) | |
| download | zsh-63271a4b9308a3965a0f0a97175cbcfdf1a3b813.tar.gz zsh-63271a4b9308a3965a0f0a97175cbcfdf1a3b813.tar.xz zsh-63271a4b9308a3965a0f0a97175cbcfdf1a3b813.zip | |
41808: _git-cherry-pick: Typo fixes
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Completion/Unix/Command/_git | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 08ccc3470..b273fe9ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index 26554de05..030d23ae2 100644 --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -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]" \ |