Merge branch 'jp/completion-help-alias'

* jp/completion-help-alias:
git-completion: Add git help completion for aliases

diff --combined contrib/completion/git-completion.bash
index 3b1cc83e2d120b03d0a2fc8ca36078d22b1c9c15,d2b8746633bdba57b2bfdd137435d9ba95e68e3e..1b589fadbb5dd94827cf1565bce232d0f3a3c42a
--- 1/contrib/completion/git-completion.bash
--- 2/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@@ -664,14 -664,11 +664,14 @@@ __git_compute_merge_strategies (
        : ${__git_merge_strategies:=$(__git_list_merge_strategies)}
  }
  
 -__git_complete_file ()
 +__git_complete_revlist_file ()
  {
        local pfx ls ref cur
        _get_comp_words_by_ref -n =: cur
        case "$cur" in
 +      *..?*:*)
 +              return
 +              ;;
        ?*:*)
                ref="${cur%%:*}"
                cur="${cur#*:}"
@@@ -685,7 -682,7 +685,7 @@@
                *)
                        ls="$ref"
                        ;;
 -          esac
 +              esac
  
                case "$COMP_WORDBREAKS" in
                *:*) : great ;;
@@@ -710,6 -707,17 +710,6 @@@
                                       s/^.*    //')" \
                        -- "$cur"))
                ;;
 -      *)
 -              __gitcomp "$(__git_refs)"
 -              ;;
 -      esac
 -}
 -
 -__git_complete_revlist ()
 -{
 -      local pfx cur
 -      _get_comp_words_by_ref -n =: cur
 -      case "$cur" in
        *...*)
                pfx="${cur%...*}..."
                cur="${cur#*...}"
@@@ -726,17 -734,6 +726,17 @@@
        esac
  }
  
 +
 +__git_complete_file ()
 +{
 +      __git_complete_revlist_file
 +}
 +
 +__git_complete_revlist ()
 +{
 +      __git_complete_revlist_file
 +}
 +
  __git_complete_remote_or_refspec ()
  {
        local cur words cword
@@@ -1359,7 -1356,7 +1359,7 @@@ _git_diff (
                return
                ;;
        esac
 -      __git_complete_file
 +      __git_complete_revlist_file
  }
  
  __git_mergetools_common="diffuse ecmerge emerge kdiff3 meld opendiff
@@@ -1511,7 -1508,7 +1511,7 @@@ _git_help (
                ;;
        esac
        __git_compute_all_commands
-       __gitcomp "$__git_all_commands
+       __gitcomp "$__git_all_commands $(__git_aliases)
                attributes cli core-tutorial cvs-migration
                diffcore gitk glossary hooks ignore modules
                repository-layout tutorial tutorial-2