edit an alias for unlock

CmdLine.hs

@@ -46,6 +46,8 @@ subCmds =
 		"transfer content of files to/from another repository"
 	, SubCommand "unlock" path	(withFilesInGit Command.Unlock.start)
 		"unlock files for modification"
+	, SubCommand "edit" path	(withFilesInGit Command.Unlock.start)
+		"same as unlock"
 	, SubCommand "lock" path	(withFilesInGit Command.Lock.start)
 		"undo unlock command"
 	, SubCommand "init" desc	(withDescription Command.Init.start)

debian/changelog

@@ -1,7 +1,8 @@
 git-annex (0.04) UNRELEASED; urgency=low
 
   * Add unlock subcommand, which replaces the symlink with a copy of
-    the file's content in preparation of changing it.
+    the file's content in preparation of changing it. The "edit" subcommand
+    is an alias for unlock.
   * Add lock subcommand.
   * Unlocked files will now automatically be added back into the annex when
     committed (and the updated symlink committed), by some magic in the

doc/git-annex.mdwn

@@ -89,6 +89,11 @@ Many git-annex subcommands will stage changes for later `git commit` by you.
   When you `git commit`, the file, the new content is injected back into
   the annex.
 
+* edit [path ...]
+
+  This is an alias for the unlock subcommand. May be easier to remember,
+  if you think of this as allowing you to edit an annexed file.
+
 * move [path ...]
 
   When used with the --to option, moves the content of annexed files from