X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;f=advice.h;h=fad36df467f065bf7ff7a82d9d447ee4ac5cecb9;hb=a1d68bea891118bdaecb6dd77610e6daf2f7d53d;hp=f3cdbbf29e570e151b2b6b329ee9a9940ae59a98;hpb=267aaa08e2e9b236d4ace006055066e353af8038;p=git.git diff --git a/advice.h b/advice.h index f3cdbbf29..fad36df46 100644 --- a/advice.h +++ b/advice.h @@ -3,10 +3,13 @@ #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_commit_before_merge; extern int advice_resolve_conflict;