mirror of
https://github.com/git/git.git
synced 2024-11-24 10:26:17 +08:00
4c371f9127
The commit-before-pull is well accepted in the DVCS community, but is confusing some new users. This should get them back in the right way when the problem occurs. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
11 lines
236 B
C
11 lines
236 B
C
#ifndef ADVICE_H
|
|
#define ADVICE_H
|
|
|
|
extern int advice_push_nonfastforward;
|
|
extern int advice_status_hints;
|
|
extern int advice_commit_before_merge;
|
|
|
|
int git_default_advice_config(const char *var, const char *value);
|
|
|
|
#endif /* ADVICE_H */
|