Skip to main content

Browse the archive

Staging
v0.5.1
Revision e923eaeb901ff056421b9007adcbbce271caa7b6 authored by Junio C Hamano on 12 February 2010, 23:45:05 UTC, committed by Junio C Hamano on 12 February 2010, 23:45:05 UTC 
Git 1.7.0
 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent ca5812d
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;

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