Skip to main content

Browse the archive

Staging
v0.5.1
https://github.com/git/git
23 January 2022, 05:21:09 UTC
Revision cf8899d285d2648013040ec7196ffd3de0606664 authored by Junio C Hamano on 01 August 2017, 18:45:17 UTC, committed by Junio C Hamano on 01 August 2017, 18:45:17 UTC 
Git 2.13.4
 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent c94ef19
Raw File
Tip revision: cf8899d285d2648013040ec7196ffd3de0606664 authored by Junio C Hamano on 01 August 2017, 18:45:17 UTC
Git 2.13.4
Tip revision: cf8899d
advice.h 
#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_matching;
extern int advice_push_already_exists;
extern int advice_push_fetch_first;
extern int advice_push_needs_force;
extern int advice_status_hints;
extern int advice_status_u_option;
extern int advice_commit_before_merge;
extern int advice_resolve_conflict;
extern int advice_implicit_identity;
extern int advice_detached_head;
extern int advice_set_upstream_failure;
extern int advice_object_name_warning;
extern int advice_rm_hints;

int git_default_advice_config(const char *var, const char *value);
__attribute__((format (printf, 1, 2)))
void advise(const char *advice, ...);
int error_resolve_conflict(const char *me);
extern void NORETURN die_resolve_conflict(const char *me);
void NORETURN die_conclude_merge(void);
void detach_advice(const char *new_name);

#endif /* ADVICE_H */
back to top