l10n: git.pot: v1.8.3 round 1 (54 new, 15 removed)
[gitweb.git] / advice.h
index f3cdbbf29e570e151b2b6b329ee9a9940ae59a98..94caa32f9213f59a627176ec8b4aea022f6b0f8f 100644 (file)
--- a/advice.h
+++ b/advice.h
@@ -3,15 +3,20 @@
 
 #include "git-compat-util.h"
 
-extern int advice_push_nonfastforward;
+extern int advice_push_update_rejected;
 extern int advice_push_non_ff_current;
 extern int advice_push_non_ff_default;
 extern int advice_push_non_ff_matching;
+extern int advice_push_already_exists;
+extern int advice_push_fetch_first;
+extern int advice_push_needs_force;
 extern int advice_status_hints;
+extern int advice_status_u_option;
 extern int advice_commit_before_merge;
 extern int advice_resolve_conflict;
 extern int advice_implicit_identity;
 extern int advice_detached_head;
+extern int advice_set_upstream_failure;
 
 int git_default_advice_config(const char *var, const char *value);
 void advise(const char *advice, ...);