https://github.com/git/git
Revision c2a9ada7c2aa26ec71033cf1459d25ea91ce45fd authored by Alexander on 14 August 2017, 02:14:25 UTC, committed by GitHub on 14 August 2017, 02:14:25 UTC
Hello.

I fixed 2 mistakes in the tranlstion: 'рашей' -> 'вашей'.
1 parent b3622a4
Raw File
Tip revision: c2a9ada7c2aa26ec71033cf1459d25ea91ce45fd authored by Alexander on 14 August 2017, 02:14:25 UTC
[translation][fix] Fixed mistypes in the russian translation
Tip revision: c2a9ada
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;
extern int advice_add_embedded_repo;

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