Merge branch 'js/maint-bisect-gitk'

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 8ec782dc54c9eb49873e38b75d925babe9a7746c..7b074d79854813ffa38f781218bd878a79cbb505 100755 (executable)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -563,7 +563,7 @@ _git_add ()
        --*)
                __gitcomp "
                        --interactive --refresh --patch --update --dry-run
-                       --ignore-errors
+                       --ignore-errors --intent-to-add
                        "
                return
        esac
@@ -1738,6 +1738,7 @@ _git ()
        show)        _git_show ;;
        show-branch) _git_show_branch ;;
        stash)       _git_stash ;;
+       stage)       _git_add ;;
        submodule)   _git_submodule ;;
        svn)         _git_svn ;;
        tag)         _git_tag ;;