Skip to main content

Browse the archive

https://github.com/git/git
31 May 2024, 23:06:24 UTC
Revision b43ba7891422127eb3ec7bd88c9a8ea102b19d0c authored by Junio C Hamano on 21 December 2011, 19:42:45 UTC, committed by Junio C Hamano on 21 December 2011, 19:42:45 UTC 
Merge branch 'jl/submodule-status-failure-report' into maint
 
* jl/submodule-status-failure-report:
  diff/status: print submodule path when looking for changes fails
2 parent s f0b4fd4 + 6a5ceda
Raw File
Tip revision: b43ba7891422127eb3ec7bd88c9a8ea102b19d0c authored by Junio C Hamano on 21 December 2011, 19:42:45 UTC
Merge branch 'jl/submodule-status-failure-report' into maint
Tip revision: b43ba78
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);

#endif /* ADVICE_H */
back to top