Skip to main content

Browse the archive

Staging
v0.5.1
https://github.com/git/git
23 January 2022, 05:21:09 UTC
Revision d0f1ea6003d97e63110fa7d50bb07f546a909b6e authored by Junio C Hamano on 26 April 2012, 17:23:15 UTC, committed by Junio C Hamano on 26 April 2012, 17:23:15 UTC 
Git 1.7.9.7
 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent b2bab5b
Raw File
Tip revision: d0f1ea6003d97e63110fa7d50bb07f546a909b6e authored by Junio C Hamano on 26 April 2012, 17:23:15 UTC
Git 1.7.9.7
Tip revision: d0f1ea6
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);
void advise(const char *advice, ...);
int error_resolve_conflict(const char *me);
extern void NORETURN die_resolve_conflict(const char *me);

#endif /* ADVICE_H */
back to top