Skip to main content

Browse the archive

Staging
v0.5.1
https://github.com/git/git
23 January 2022, 05:21:09 UTC
Revision 00653435488f5ed86c5d6dc411fa14fa56f5e3bc authored by Junio C Hamano on 18 January 2012, 23:46:31 UTC, committed by Junio C Hamano on 18 January 2012, 23:46:31 UTC 
Git 1.7.7.6
 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 5c8eeb8
Raw File
Tip revision: 00653435488f5ed86c5d6dc411fa14fa56f5e3bc authored by Junio C Hamano on 18 January 2012, 23:46:31 UTC
Git 1.7.7.6
Tip revision: 0065343
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