Merge branch 'jk/pickaxe-textconv'

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index bc0657a22481d4482253bc1f151645d07d10f319..0960acc58680b97a6cc0cf22fe7980d8758c6ee4 100644 (file)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -321,7 +321,7 @@ __git_refs ()
                                if [[ "$ref" == "$cur"* ]]; then
                                        echo "$ref"
                                fi
-                       done | uniq -u
+                       done | sort | uniq -u
                fi
                return
        fi
@@ -585,7 +585,7 @@ __git_list_porcelain_commands ()
 {
        local i IFS=" "$'\n'
        __git_compute_all_commands
-       for i in "help" $__git_all_commands
+       for i in $__git_all_commands
        do
                case $i in
                *--*)             : helper pattern;;