31750: _git: add new configuration options to match latest git v1.8.3

1 files changed, 100 insertions, 1 deletions

diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 205ae67f8..294620be5 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -1781,15 +1781,29 @@ _git-config () {
   declare -a git_options_static
   git_options_static=(
     advice.pushNonFastForward:'show advice when git push refuses non-fast-forward refs::->bool:true'
+    advice.pushUpdateRejected:'combined setting for advice.push*::->bool:true'
+    advice.pushNonFFCurrent:'show advice when git push fails due to a non-fast-forward update to the current branch::->bool:true'
+    advice.pushNonFFDefault:'show advice to set push.default to "upstream" or "current" after running git-push::->bool:true'
+    advice.pushNonFFMatching:'show advice when running git-push and pushed matching refs explicitly::->bool:true'
+    advice.pushAlreadyExists:'show advice when git-push rejects an update that does not qualify for fast-forwarding::->bool:true'
+    advice.pushFetchFirst:'show advice when git-push rejects an update that tries to overwrite a remote ref that points at unknown object::->bool:true'
+    advice.pushNeedsForce:'show advice when git-push rejects an update that tries to overwrite a remote ref that points a non-commitish::->bool:true'
     advice.statusHints:'show advice in output of git status::->bool:true'
+    advice.statusUoption:'show advice to consider using the "-u" option to git-status when it takes more than 2 seconds::->bool:true'