Code

completion: commit --fixup and --squash
authorTeemu Matilainen <teemu.matilainen@iki.fi>
Thu, 6 Oct 2011 18:40:30 +0000 (21:40 +0300)
committerJunio C Hamano <gitster@pobox.com>
Thu, 6 Oct 2011 22:11:50 +0000 (15:11 -0700)
Signed-off-by: Teemu Matilainen <teemu.matilainen@iki.fi>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
contrib/completion/git-completion.bash

index 43a7a36f0638fe12274ae94117c3c0f4c14cc2d1..e6fd43bb2d5fb759ea3b3d89264f664e818646a0 100755 (executable)
@@ -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