Skip to main content

Browse the archive

Staging
v0.5.1
https://github.com/git/git
23 January 2022, 05:21:09 UTC
Revision 0e2d57fd50f61e668be3180bc8f25991ea88aa8c authored by Junio C Hamano on 14 March 2012, 22:38:47 UTC, committed by Junio C Hamano on 14 March 2012, 22:47:45 UTC 
Git 1.7.10-rc1
 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent d973dc0
Raw File
Tip revision: 0e2d57fd50f61e668be3180bc8f25991ea88aa8c authored by Junio C Hamano on 14 March 2012, 22:38:47 UTC
Git 1.7.10-rc1
Tip revision: 0e2d57f
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);
void detach_advice(const char *new_name);

#endif /* ADVICE_H */
back to top