summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Completion/Unix/Command/_git2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6437d956e..d39b70489 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-30 Clint Adams <clint@zsh.org>
+
+ * Frank Terbeck: 25551: Completion/Unix/Command/_git: remove
+ a stray period from a description.
+
2008-08-29 Clint Adams <clint@zsh.org>
* Mikael Magnusson: 25539: Completion/Unix/Command/_git: more
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 0941d3919..e298090b7 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -1354,7 +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.]' \
+ '--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]' \