From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 27 Mar 2011 03:13:17 +0000 (-0700)
Subject: Merge branch 'jp/completion-help-alias'
X-Git-Tag: v1.7.5-rc0~17
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/908535c1fa1c5cddddfa74732c66d625e99bd6b0?hp=149971badc562f4e5ee66c045f40c904fb29eab6

Merge branch 'jp/completion-help-alias'

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

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 3b1cc83e2d..1b589fadbb 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1511,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