Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

unposted: fix a typo in _git from previous commit (reolved)

  • Loading branch information...
commit 43ddb7329773fb1bc7c9aa454fa82d747fb3b069 1 parent 45090b1
Mikachu authored March 06, 2012

Showing 1 changed file with 1 addition and 1 deletion. Show diff stats Hide diff stats

  1. 2  Completion/Unix/Command/_git
2  Completion/Unix/Command/_git
@@ -5753,7 +5753,7 @@ __git_setup_merge_options () {
5753 5753
     '(--stat -n --no-stat)'{-n,--no-stat}'[do not show diffstat at the end of the merge]'
5754 5754
     '(         --no-squash)--squash[merge, but do not commit]'
5755 5755
     '(--squash            )--no-squash[merge and commit]'
5756  
-    '--ff-only[refuse to merge unless HEAD is up to date or merge can be reolved as a fast-forward]'
  5756
+    '--ff-only[refuse to merge unless HEAD is up to date or merge can be resolved as a fast-forward]'
5757 5757
     '*'{-s,--strategy=}'[use given merge strategy]:merge strategy:__git_merge_strategies'
5758 5758
     '*'{-X,--strategy-option=}'[pass merge-strategy-specific option to merge strategy]'
5759 5759
     '(-q --quiet -v --verbose)'{-q,--quiet}'[suppress all output]'

0 notes on commit 43ddb73

Please sign in to comment.
Something went wrong with that request. Please try again.