diff options
| author |  Joey Hess <joey@kitenet.net> | 2010-11-10 13:28:04 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-11-10 13:28:04 -0400 |
| commit | 99d9c1cf893f1ad6bf400219a47593cf70993768 (patch) | |
| tree | 8a23cf7bebb3d94dedbcf72fb17a680dd90c95d9 | |
| parent | ee6052cbf8337f60d4c1ee590f21b24f77f3b210 (diff) | |
edit an alias for unlock
| -rw-r--r-- | CmdLine.hs | 2 | ||||
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | doc/git-annex.mdwn | 5 |
3 files changed, 9 insertions, 1 deletions
diff --git a/CmdLine.hs b/CmdLine.hs index 1c73533df..3f2b1e94e 100644 --- a/CmdLine.hs +++ b/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) diff --git a/debian/changelog b/debian/changelog index 02c4ec295..d3733aeb8 100644 --- a/debian/changelog +++ b/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 diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn index d3cf594aa..cb3cde0a7 100644 --- a/doc/git-annex.mdwn +++ b/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 |