zsh-workers
 help / color / mirror / code / Atom feed
* [PATCH] _git: Fix typo in diff.algorithm completion
@ 2016-05-03  6:41 Russell Currey
  2016-05-03 11:41 ` Daniel Shahaf
  0 siblings, 1 reply; 2+ messages in thread
From: Russell Currey @ 2016-05-03  6:41 UTC (permalink / raw)
  To: zsh-workers; +Cc: Russell Currey

Signed-off-by: Russell Currey <ruscur@russell.cc>
---
 Completion/Unix/Command/_git | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index d300207..2fa004a 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"
-- 
2.8.2


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] _git: Fix typo in diff.algorithm completion
  2016-05-03  6:41 [PATCH] _git: Fix typo in diff.algorithm completion Russell Currey
@ 2016-05-03 11:41 ` Daniel Shahaf
  0 siblings, 0 replies; 2+ messages in thread
From: Daniel Shahaf @ 2016-05-03 11:41 UTC (permalink / raw)
  To: Russell Currey; +Cc: zsh-workers

Russell Currey wrote on Tue, May 03, 2016 at 16:41:24 +1000:
> +++ b/Completion/Unix/Command/_git
> @@ -6320,7 +6320,7 @@ __git_setup_diff_options () {
> -    '(--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]'

Thanks, applied.

I've fixed the subject before committing (it didn't agree with the
change); did you also have a patch to the _git-config() completion of
diff.algorithm?

Cheers,

Daniel


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2016-05-03 11:42 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-05-03  6:41 [PATCH] _git: Fix typo in diff.algorithm completion Russell Currey
2016-05-03 11:41 ` Daniel Shahaf

Code repositories for project(s) associated with this public inbox

	https://git.vuxu.org/mirror/zsh/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).