Skip to content

Commit d2865da

Browse files
pcloudsgitster
authored andcommitted
rerere.h: drop extern from function declaration
Signed-off-by: Nguyễn Thái Ngọc Duy <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 5146f1f commit d2865da

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

rerere.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,19 @@ struct rerere_id {
2222
int variant;
2323
};
2424

25-
extern int setup_rerere(struct string_list *, int);
26-
extern int rerere(int);
25+
int setup_rerere(struct string_list *, int);
26+
int rerere(int);
2727
/*
2828
* Given the conflict ID and the name of a "file" used for replaying
2929
* the recorded resolution (e.g. "preimage", "postimage"), return the
3030
* path to that filesystem entity. With "file" specified with NULL,
3131
* return the path to the directory that houses these files.
3232
*/
33-
extern const char *rerere_path(const struct rerere_id *, const char *file);
34-
extern int rerere_forget(struct pathspec *);
35-
extern int rerere_remaining(struct string_list *);
36-
extern void rerere_clear(struct string_list *);
37-
extern void rerere_gc(struct string_list *);
33+
const char *rerere_path(const struct rerere_id *, const char *file);
34+
int rerere_forget(struct pathspec *);
35+
int rerere_remaining(struct string_list *);
36+
void rerere_clear(struct string_list *);
37+
void rerere_gc(struct string_list *);
3838

3939
#define OPT_RERERE_AUTOUPDATE(v) OPT_UYN(0, "rerere-autoupdate", (v), \
4040
N_("update the index with reused conflict resolution if possible"))

0 commit comments

Comments
 (0)