aboutsummaryrefslogtreecommitdiff
path: root/builtin-merge.c
diff options
context:
space:
mode:
authorStephan Beyer <s-beyer@gmx.net>2008-07-24 01:09:35 +0200
committerJunio C Hamano <gitster@pobox.com>2008-07-23 18:38:14 -0700
commit186458b11b090835fa793bcdbf6b5552b053276c (patch)
tree5e1fa9156b954b0c05c1d0963c6db91a2d347d67 /builtin-merge.c
parent0c4cd7f4a7aae5527560090aad7ef8dae85f1264 (diff)
downloadgit-186458b11b090835fa793bcdbf6b5552b053276c.tar.gz
git-186458b11b090835fa793bcdbf6b5552b053276c.tar.xz
Make non-static functions, that may be static, static
Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge.c')
-rw-r--r--builtin-merge.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-merge.c b/builtin-merge.c
index 8825dcf8d..e78fa18b3 100644
--- a/builtin-merge.c
+++ b/builtin-merge.c
@@ -431,7 +431,7 @@ static void merge_name(const char *remote, struct strbuf *msg)
sha1_to_hex(remote_head->sha1), remote);
}
-int git_merge_config(const char *k, const char *v, void *cb)
+static int git_merge_config(const char *k, const char *v, void *cb)
{
if (branch && !prefixcmp(k, "branch.") &&
!prefixcmp(k + 7, branch) &&