mirror of
git://git.code.sf.net/p/zsh/code
synced 2025-09-05 11:01:13 +02:00
Frank Terbeck: 25537: add --abort to options for 'git am'.
This commit is contained in:
parent
b8ae885ab8
commit
4ee3f5ffe2
2 changed files with 6 additions and 0 deletions
|
@ -1,3 +1,8 @@
|
|||
2008-08-29 Clint Adams <clint@zsh.org>
|
||||
|
||||
* Frank Terbeck: 25537: Completion/Unix/Command/_git: add --abort
|
||||
to options for 'git am'.
|
||||
|
||||
2008-08-25 Peter Stephenson <p.w.stephenson@ntlworld.com>
|
||||
|
||||
* 25532, Src/exec.c, Test/C03traps.ztst: skipping next command
|
||||
|
|
|
@ -1354,6 +1354,7 @@ __git_zstyle_default ':completion::complete:git-add:argument-rest:*' ignore-line
|
|||
_git-am () {
|
||||
_arguments \
|
||||
'--3way[use 3-way merge if patch does not apply cleanly]' \
|
||||
'--abort[restore the original branch and abort the patching operation.]' \
|
||||
'--binary[pass "--allow-binary-replacement" to "git-apply"]' \
|
||||
'--dotest=-[use given directory as working area instead of .dotest]:directory:_directories' \
|
||||
'--interactive[apply patches interactively]' \
|
||||
|
|
Loading…
Reference in a new issue