mirror of
https://github.com/git/git
synced 2024-11-05 18:59:29 +00:00
b450568209
Add 'advice.pushAlreadyExists' option to disable the advice shown when an update is rejected for a reference that is not allowed to update at all (verses those that are allowed to fast-forward.) Signed-off-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
23 lines
713 B
C
23 lines
713 B
C
#ifndef ADVICE_H
|
|
#define ADVICE_H
|
|
|
|
#include "git-compat-util.h"
|
|
|
|
extern int advice_push_update_rejected;
|
|
extern int advice_push_non_ff_current;
|
|
extern int advice_push_non_ff_default;
|
|
extern int advice_push_non_ff_matching;
|
|
extern int advice_push_already_exists;
|
|
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 */
|