Andrew's git / gitweb.git / advice.h
?
advice.hon commit Implement automatic fast-forward merge for submodules (68d03e4)
   1#ifndef ADVICE_H
   2#define ADVICE_H
   3
   4#include "git-compat-util.h"
   5
   6extern int advice_push_nonfastforward;
   7extern int advice_status_hints;
   8extern int advice_commit_before_merge;
   9extern int advice_resolve_conflict;
  10extern int advice_implicit_identity;
  11extern int advice_detached_head;
  12
  13int git_default_advice_config(const char *var, const char *value);
  14
  15extern void NORETURN die_resolve_conflict(const char *me);
  16
  17#endif /* ADVICE_H */