https://github.com/git/git
Revision 956d86d1c9078eba380eb2530b0ff577a85c2e69 authored by Erik Faye-Lund on 08 December 2011, 19:39:57 UTC, committed by Junio C Hamano on 09 December 2011, 18:46:52 UTC
POSIX says that last parameter to waitpid should be 'int',
so let's make it so.

Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent a8d05d7
Raw File
Tip revision: 956d86d1c9078eba380eb2530b0ff577a85c2e69 authored by Erik Faye-Lund on 08 December 2011, 19:39:57 UTC
mingw: give waitpid the correct signature
Tip revision: 956d86d
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);

extern void NORETURN die_resolve_conflict(const char *me);

#endif /* ADVICE_H */
back to top