Clear up short option confusion between --from and --force (-f is now --from, and there is no short option for --force).

Options.hs

@@ -20,7 +20,7 @@ type Option = OptDescr (Annex ())
 
 commonOptions :: [Option]
 commonOptions =
-	[ Option ['f'] ["force"] (NoArg (setforce True))
+	[ Option [] ["force"] (NoArg (setforce True))
 		"allow actions that may lose annexed data"
 	, Option ['F'] ["fast"] (NoArg (setfast True))
 		"avoid slow operations"

debian/changelog

@@ -7,6 +7,8 @@ git-annex (0.20110402) UNRELEASED; urgency=low
   * Unused files on remotes, particulary special remotes, can now be
     identified and dropped, by using "--from remote" with git annex unused
     and git annex dropunused.
+  * Clear up short option confusion between --from and --force (-f is now
+    --from, and there is no short option for --force).
 
  -- Joey Hess <joeyh@debian.org>  Sat, 02 Apr 2011 13:45:54 -0400
 

doc/bugs/git_annex_copy_-f_REMOTE_._doesn__39__t_work_as_expected.mdwn

@@ -12,3 +12,7 @@ which gives me
 I would have expected that since *--to* is the same as *-t* and *--from* is the same as *-f* as the in program documentation suggests. But *-f* clashes with the force command, I would suggest that the short form of *--force* be changed to *-F* and possibly rename the *Fast* commands to *Quick* and use *-Q* as the short form of the *Quick* operations. I didn't try the *-f* option with the move command, but it probably suffers from the same issue. It's probably better to avoid clashing short forms of command options.
 
 I guess this issue is just a documentation issue and a minor interface change if needed and not a bug of git-annex, but a quirk.
+
+> Yeah, -f needs to be from; -F was already --fast. I have made --force not
+> have any short option abbreviation, I think it's entirely reasonable to
+> avoid fat-fingering an option that can lose data. [[done]] --[[Joey]]