diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-09-19 14:23:19 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-09-19 14:23:19 -0400 |
| commit | 1c330ead1f8df449950c4450686da2b941a2417f (patch) | |
| tree | 6a054bbb3e4d6c6342cfc95034da881cc67224b9 | |
| parent | 105cfeaa0017c48de11d6714326ab320993aac52 (diff) | |
| parent | dcd29f4cf57d8bf3bc84bd3368b1e5e09ed8d85e (diff) | |
Merge remote-tracking branch 'anarcat/master'
| -rw-r--r-- | Command/List.hs (renamed from Command/Remotes.hs) | 4 | ||||
| -rw-r--r-- | GitAnnex.hs | 4 | ||||
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | doc/git-annex.mdwn | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/Command/Remotes.hs b/Command/List.hs index f9ae9b3cd..61f77f7f3 100644 --- a/Command/Remotes.hs +++ b/Command/List.hs @@ -5,7 +5,7 @@ - Licensed under the GNU GPL version 3 or higher. -} -module Command.Remotes where +module Command.List where import qualified Data.Set as S @@ -16,7 +16,7 @@ import Logs.Trust import Annex.UUID def :: [Command] -def = [noCommit $ command "remotes" paramPaths seek +def = [noCommit $ command "list" paramPaths seek SectionQuery "show which remotes contain files"] seek :: [CommandSeek] diff --git a/GitAnnex.hs b/GitAnnex.hs index ab1e8c3d0..ad04d9fdc 100644 --- a/GitAnnex.hs +++ b/GitAnnex.hs @@ -42,7 +42,7 @@ import qualified Command.Lock import qualified Command.PreCommit import qualified Command.Find import qualified Command.Whereis -import qualified Command.Remotes +import qualified Command.List import qualified Command.Log import qualified Command.Merge import qualified Command.Status @@ -133,7 +133,7 @@ cmds = concat , Command.AddUnused.def , Command.Find.def , Command.Whereis.def - , Command.Remotes.def + , Command.List.def , Command.Log.def , Command.Merge.def , Command.Status.def diff --git a/debian/changelog b/debian/changelog index 4329cef84..1fd137518 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,7 +4,7 @@ git-annex (4.20130912) UNRELEASED; urgency=low * Recommend using my patched gcrypt, which fixes some bugs: https://github.com/joeyh/git-remote-gcrypt * Support hot-swapping of removable drives containing gcrypt repositories. - * remotes: New command, displays a compact table of remotes that + * list: New command, displays a compact table of remotes that contain files. (Thanks, anarcat for display code and mastensg for inspiration.) * fsck: Fix detection and fixing of present direct mode files that are diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn index 27b326247..db8da9ff8 100644 --- a/doc/git-annex.mdwn +++ b/doc/git-annex.mdwn @@ -552,7 +552,7 @@ subdirectories). Displays a list of repositories known to contain the contents of the specified file or files. -* `remotes [path ...]` +* `list [path ...]` Displays a table of remotes that contain the contents of the specified files. Unlike whereis, this only shows configured remotes, not other |