Andrew's git / gitweb.git / advice.h
?
advice.hon commit git-merge(1): document diff-algorithm option to merge-recursive (4db4f0f)
   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_default;
   9extern int advice_push_non_ff_matching;
  10extern int advice_push_already_exists;
  11extern int advice_status_hints;
  12extern int advice_commit_before_merge;
  13extern int advice_resolve_conflict;
  14extern int advice_implicit_identity;
  15extern int advice_detached_head;
  16
  17int git_default_advice_config(const char *var, const char *value);
  18void advise(const char *advice, ...);
  19int error_resolve_conflict(const char *me);
  20extern void NORETURN die_resolve_conflict(const char *me);
  21void detach_advice(const char *new_name);
  22
  23#endif /* ADVICE_H */