Skip to main content

Browse the archive

Revision 8165952517bf82b6a632cefc047ad14f36a74b25 authored by Junio C Hamano on 19 April 2010, 08:28:27 UTC, committed by Junio C Hamano on 19 April 2010, 08:28:27 UTC 
Merge branch 'maint-1.6.6' into maint
 
* maint-1.6.6:
  MSVC: Fix build by adding missing termios.h dummy
2 parent s 03aa87e + b756864
Raw File
advice.h 
#ifndef ADVICE_H
#define ADVICE_H

#include "git-compat-util.h"

extern int advice_push_nonfastforward;
extern int advice_status_hints;
extern int advice_commit_before_merge;
extern int advice_resolve_conflict;
extern int advice_implicit_identity;
extern int advice_detached_head;

int git_default_advice_config(const char *var, const char *value);

extern void NORETURN die_resolve_conflict(const char *me);

#endif /* ADVICE_H */
back to top