Document ls, sort help by name

diff --git a/zit b/zit
index da15e3b..6cdd397 100755 (executable)
--- a/zit
+++ b/zit
@@ -28,11 +28,20 @@ zit_help() {
        cmd="$1"
        shift
        case "$cmd" in
        cmd="$1"
        shift
        case "$cmd" in

+       clone)
+               echo "usage: zit clone REPO [FILE]"
+               echo "Create and track FILE, retrieving its history from repository REPO."
+               echo "FILE is guessed by REPO by stripping the '.git' suffix from the last path component"
+               ;;

        git)
                git help "$@"
                ;;
        git)
                git help "$@"
                ;;

-       list|tracked)
-               echo "usage: zit list"
+       import)
+               echo "usage: zit import FILE"
+               echo "Import history from an RCS-tracked file. Requires rcs-fast-export."
+               ;;
+       ls|list|tracked)
+               echo "usage: zit $cmd"

                echo "Show tracked files, with a one-letter prefix indicating their status:"
                echo "   H   cached"
                echo "   M   unmerged"
                echo "Show tracked files, with a one-letter prefix indicating their status:"
                echo "   H   cached"
                echo "   M   unmerged"


@@ -41,10 +50,6 @@ zit_help() {
                echo "   K   to be killed"
                echo "   ?   other"
                ;;
                echo "   K   to be killed"
                echo "   ?   other"
                ;;

-       import)
-               echo "usage: zit import FILE"
-               echo "Import history from an RCS-tracked file. Requires rcs-fast-export."
-               ;;

        view)
                echo "usage: zit view FILE"
                echo "Browse FILE's history with gitk (if possible) or tig."
        view)
                echo "usage: zit view FILE"
                echo "Browse FILE's history with gitk (if possible) or tig."


@@ -53,10 +58,13 @@ zit_help() {
                echo "usage: zit with FILE COMMAND..."
                echo "Run COMMAND after setting up the git environment for FILE."
                ;;
                echo "usage: zit with FILE COMMAND..."
                echo "Run COMMAND after setting up the git environment for FILE."
                ;;

-       clone)
-               echo "usage: zit clone REPO [FILE]"
-               echo "Create and track FILE, retrieving its history from repository REPO."
-               echo "FILE is guessed by REPO by stripping the '.git' suffix from the last path component"
+       zig)
+               echo "usage: zig FILE"
+               echo "Browse FILE's history with tig."
+               ;;
+       zik)
+               echo "usage: zik FILE"
+               echo "Browse FILE's history with gitk."

                ;;
        *)
                echo $USAGE
                ;;
        *)
                echo $USAGE


@@ -70,6 +78,7 @@ zit_help() {
                echo "   import Import RCS history for FILE"
                echo "   init           Synonym for track"
                echo "   list           Synonym for tracked"
                echo "   import Import RCS history for FILE"
                echo "   init           Synonym for track"
                echo "   list           Synonym for tracked"

+               echo "   ls             Synonym for tracked"

                echo "   track  Start tracking changes to FILE"
                echo "   tracked        List tracked files in current directory"
                echo "   view           Browse FILE's history with gitk or tig"
                echo "   track  Start tracking changes to FILE"
                echo "   tracked        List tracked files in current directory"
                echo "   view           Browse FILE's history with gitk or tig"


@@ -77,14 +86,6 @@ zit_help() {
                echo ""
                echo "See 'zit help git' or 'git help' for git commands."
                ;;
                echo ""
                echo "See 'zit help git' or 'git help' for git commands."
                ;;

-       zig)
-               echo "usage: zig FILE"
-               echo "Browse FILE's history with tig."
-               ;;
-       zik)
-               echo "usage: zik FILE"
-               echo "Browse FILE's history with gitk."
-               ;;

        esac
 }
 
        esac
 }