summary refs log tree commit diff
diff options
context:
space:
mode:
authorClint Adams <clint@users.sourceforge.net>2008-08-29 02:26:32 +0000
committerClint Adams <clint@users.sourceforge.net>2008-08-29 02:26:32 +0000
commit4ee3f5ffe251f25a02d0ee00c142d20426a2aaf7 (patch)
tree7f75afb1d89f7c70f1c4949bcb666c1fe1e9ed88
parentb8ae885ab8252f37b149472c288cf0d1c812324d (diff)
downloadzsh-4ee3f5ffe251f25a02d0ee00c142d20426a2aaf7.tar.gz
zsh-4ee3f5ffe251f25a02d0ee00c142d20426a2aaf7.tar.xz
zsh-4ee3f5ffe251f25a02d0ee00c142d20426a2aaf7.zip
Frank Terbeck: 25537: add --abort to options for 'git am'.
-rw-r--r--ChangeLog5
-rw-r--r--Completion/Unix/Command/_git1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index a94adf2fe..1ae22e2b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 25bc968b5..f65936ad3 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -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]' \