diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-06-30 11:20:28 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-03 10:42:55 -0700 |
| commit | d2865daa39117d8822f7410e3ac34a0242e5a5da (patch) | |
| tree | 4e3998201ec91112500fe48a97d85c79dc828ab6 /rerere.h | |
| parent | 5146f1f842f735a6b4f833a2476facc7ccf54268 (diff) | |
| download | git-d2865daa39117d8822f7410e3ac34a0242e5a5da.tar.gz | |
rerere.h: drop extern from function declaration
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'rerere.h')
| -rw-r--r-- | rerere.h | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -22,19 +22,19 @@ struct rerere_id { int variant; }; -extern int setup_rerere(struct string_list *, int); -extern int rerere(int); +int setup_rerere(struct string_list *, int); +int rerere(int); /* * Given the conflict ID and the name of a "file" used for replaying * the recorded resolution (e.g. "preimage", "postimage"), return the * path to that filesystem entity. With "file" specified with NULL, * return the path to the directory that houses these files. */ -extern const char *rerere_path(const struct rerere_id *, const char *file); -extern int rerere_forget(struct pathspec *); -extern int rerere_remaining(struct string_list *); -extern void rerere_clear(struct string_list *); -extern void rerere_gc(struct string_list *); +const char *rerere_path(const struct rerere_id *, const char *file); +int rerere_forget(struct pathspec *); +int rerere_remaining(struct string_list *); +void rerere_clear(struct string_list *); +void rerere_gc(struct string_list *); #define OPT_RERERE_AUTOUPDATE(v) OPT_UYN(0, "rerere-autoupdate", (v), \ N_("update the index with reused conflict resolution if possible")) |