Merge branch 'jh/status-aheadbehind'

diff --git a/advice.h b/advice.h
index e50f02cdfeff788910699f2d34fff1c93081c24b..c86de9b9b83b7aa78899347216eb17ada59430a8 100644 (file)
--- a/advice.h
+++ b/advice.h
@@ -12,6 +12,7 @@ extern int advice_push_needs_force;
 extern int advice_push_unqualified_ref_name;
 extern int advice_status_hints;
 extern int advice_status_u_option;
+extern int advice_status_ahead_behind_warning;
 extern int advice_commit_before_merge;
 extern int advice_reset_quiet_warning;
 extern int advice_resolve_conflict;