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 d2f0e23ca..48e10582f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-05-03 Russell Currey <ruscur@russell.cc>
+
+ * 38393: Completion/Unix/Command/_git: Fix typo in completion of
+ '--minimal'
+
2016-05-02 Barton E. Schaefer <schaefer@zsh.org>
* 38375 (tweaked per 38384): Test/C02cond.ztst: try harder to
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index d3002075f..2fa004a5e 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -6320,7 +6320,7 @@ __git_setup_diff_options () {
$diff_types'--raw[generate default raw diff output]'
$diff_types'--patch-with-raw[generate patch but also keep the default raw diff output]'
$diff_types{-s,--no-patch}'[suppress diff output]'
- '(--minimal --patience --histogram --diff-algorithm)--minimal[spend extra time to make sure the smallest possible diff is producedm]'
+ '(--minimal --patience --histogram --diff-algorithm)--minimal[spend extra time to make sure the smallest possible diff is produced]'
'(--minimal --patience --histogram --diff-algorithm)--patience[generate diffs with patience algorithm]'
'(--minimal --patience --histogram --diff-algorithm)--histogram[generate diffs with histogram algorithm]'
'(--minimal --patience --histogram --diff-algorithm)--diff-algorithm=[choose a diff algorithm]:diff algorithm:((default\:"basic greedy diff algorithm"