From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH 09/12] rerere.h: drop extern from function declaration
Date: Sat, 30 Jun 2018 11:20:28 +0200 [thread overview]
Message-ID: <20180630092031.29910-10-pclouds@gmail.com> (raw)
In-Reply-To: <20180630092031.29910-1-pclouds@gmail.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
rerere.h | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/rerere.h b/rerere.h
index c2961feaaa..cd948f28f4 100644
--- a/rerere.h
+++ b/rerere.h
@@ -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"))
--
2.18.0.rc2.476.g39500d3211
next prev parent reply other threads:[~2018-06-30 9:21 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-30 9:20 [PATCH 00/12] Kill the_index part2, header file cleanup Nguyễn Thái Ngọc Duy
2018-06-30 9:20 ` [PATCH 01/12] apply.h: drop extern on func declaration Nguyễn Thái Ngọc Duy
2018-06-30 9:20 ` [PATCH 02/12] attr.h: drop extern from function declaration Nguyễn Thái Ngọc Duy
2018-06-30 9:20 ` [PATCH 03/12] blame.h: drop extern on func declaration Nguyễn Thái Ngọc Duy
2018-06-30 9:20 ` [PATCH 04/12] cache-tree.h: drop extern from function declaration Nguyễn Thái Ngọc Duy
2018-06-30 9:20 ` [PATCH 05/12] convert.h: drop 'extern' " Nguyễn Thái Ngọc Duy
2018-06-30 9:20 ` [PATCH 06/12] diffcore.h: drop extern " Nguyễn Thái Ngọc Duy
2018-06-30 9:20 ` [PATCH 07/12] diff.h: remove " Nguyễn Thái Ngọc Duy
2018-06-30 9:20 ` [PATCH 08/12] line-range.h: drop " Nguyễn Thái Ngọc Duy
2018-06-30 9:20 ` Nguyễn Thái Ngọc Duy [this message]
2018-06-30 9:20 ` [PATCH 10/12] repository.h: " Nguyễn Thái Ngọc Duy
2018-06-30 9:20 ` [PATCH 11/12] revision.h: " Nguyễn Thái Ngọc Duy
2018-06-30 9:20 ` [PATCH 12/12] submodule.h: " Nguyễn Thái Ngọc Duy
2018-07-02 16:09 ` [PATCH 00/12] Kill the_index part2, header file cleanup Brandon Williams
2018-07-21 9:06 ` Duy Nguyen
2018-08-03 16:16 ` Duy Nguyen
2018-08-03 17:13 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180630092031.29910-10-pclouds@gmail.com \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).