Merge branch 'js/larger-timestamps'

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index af658995d55025418c94061842f8d84809b27ef0..1ed0a09feef51ae606dbc2d7aa1944a49c6c28ee 100644 (file)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1319,6 +1319,7 @@ _git_clone ()
                        --template=
                        --depth
                        --single-branch
+                       --no-tags
                        --branch
                        --recurse-submodules
                        --no-single-branch
@@ -2387,7 +2388,9 @@ _git_config ()
                color.status.added
                color.status.changed
                color.status.header
+               color.status.localBranch
                color.status.nobranch
+               color.status.remoteBranch
                color.status.unmerged
                color.status.untracked
                color.status.updated