Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2023-03-28 16:58:55 +0300
committerJunio C Hamano <gitster@pobox.com>2023-03-28 17:36:46 +0300
commitb26a71b1beadf0184259384c12c9567ac89c0d13 (patch)
tree2648463f4e6106498711012722ac315ca9be1170 /rerere.h
parent12cb1c10a64170a5d600dd1c6c8abfeec105fb6b (diff)
cocci: apply the "rerere.h" part of "the_repository.pending"
Apply the part of "the_repository.pending.cocci" pertaining to "rerere.h". Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'rerere.h')
-rw-r--r--rerere.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/rerere.h b/rerere.h
index c32d79c3bd..876c316321 100644
--- a/rerere.h
+++ b/rerere.h
@@ -24,9 +24,6 @@ struct rerere_id {
};
int setup_rerere(struct repository *,struct string_list *, int);
-#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
-#define rerere(flags) repo_rerere(the_repository, flags)
-#endif
int repo_rerere(struct repository *, int);
/*
* Given the conflict ID and the name of a "file" used for replaying