diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-05-13 23:50:32 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-05-13 23:50:32 +0900 |
| commit | 4aeeef377347934d6f459e27f7d793de4ce384bb (patch) | |
| tree | a8031c9623eac896bf474ba2158e39afc6abb5b3 /advice.h | |
| parent | Merge branch 'ew/repack-with-bitmaps-by-default' (diff) | |
| parent | *.[ch]: manually align parameter lists (diff) | |
| download | tgif-4aeeef377347934d6f459e27f7d793de4ce384bb.tar.xz | |
Merge branch 'dl/no-extern-in-func-decl'
Mechanically and systematically drop "extern" from function
declarlation.
* dl/no-extern-in-func-decl:
*.[ch]: manually align parameter lists
*.[ch]: remove extern from function declarations using sed
*.[ch]: remove extern from function declarations using spatch
Diffstat (limited to 'advice.h')
| -rw-r--r-- | advice.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -32,7 +32,7 @@ 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_resolve_conflict(const char *me); void NORETURN die_conclude_merge(void); void detach_advice(const char *new_name); |