advice.hon commit Merge branch 'jc/push-2.0-default-to-simple' (009055f)
   1#ifndef ADVICE_H
   2#define ADVICE_H
   3
   4#include "git-compat-util.h"
   5
   6extern int advice_push_update_rejected;
   7extern int advice_push_non_ff_current;
   8extern int advice_push_non_ff_matching;
   9extern int advice_push_already_exists;
  10extern int advice_push_fetch_first;
  11extern int advice_push_needs_force;
  12extern int advice_status_hints;
  13extern int advice_status_u_option;
  14extern int advice_commit_before_merge;
  15extern int advice_resolve_conflict;
  16extern int advice_implicit_identity;
  17extern int advice_detached_head;
  18extern int advice_set_upstream_failure;
  19extern int advice_object_name_warning;
  20extern int advice_rm_hints;
  21
  22int git_default_advice_config(const char *var, const char *value);
  23__attribute__((format (printf, 1, 2)))
  24void advise(const char *advice, ...);
  25int error_resolve_conflict(const char *me);
  26extern void NORETURN die_resolve_conflict(const char *me);
  27void detach_advice(const char *new_name);
  28
  29#endif /* ADVICE_H */