From: Teemu Matilainen <teemu.matilainen@iki.fi>
Date: Thu, 6 Oct 2011 18:40:30 +0000 (+0300)
Subject: completion: commit --fixup and --squash
X-Git-Tag: v1.7.8-rc0~55^2~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=77653abd988fb333f7b155e23a3bcea6042505bc;p=git.git

completion: commit --fixup and --squash

Signed-off-by: Teemu Matilainen <teemu.matilainen@iki.fi>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 43a7a36f0..e6fd43bb2 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1287,7 +1287,8 @@ _git_commit ()
 			" "" "${cur##--cleanup=}"
 		return
 		;;
-	--reuse-message=*|--reedit-message=*)
+	--reuse-message=*|--reedit-message=*|\
+	--fixup=*|--squash=*)
 		__gitcomp "$(__git_refs)" "" "${cur#*=}"
 		return
 		;;
@@ -1302,7 +1303,7 @@ _git_commit ()
 			--dry-run --reuse-message= --reedit-message=
 			--reset-author --file= --message= --template=
 			--cleanup= --untracked-files --untracked-files=
-			--verbose --quiet
+			--verbose --quiet --fixup= --squash=
 			"
 		return
 	esac