summaryrefslogtreecommitdiff
path: root/notes-merge.c
diff options
context:
space:
mode:
authorDerrick Stolee <dstolee@microsoft.com>2018-07-20 16:33:04 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-07-20 22:38:54 (GMT)
commit6404355657fb3ec27668fb88c5175bb22aff3acc (patch)
treefe54e41041c355ae014cb00d9e513be157a15ac9 /notes-merge.c
parent5227c385667cadd3b34668329016755181fa98ea (diff)
downloadgit-6404355657fb3ec27668fb88c5175bb22aff3acc.zip
git-6404355657fb3ec27668fb88c5175bb22aff3acc.tar.gz
git-6404355657fb3ec27668fb88c5175bb22aff3acc.tar.bz2
commit.h: remove method declarations
These methods are now declared in commit-reach.h. Remove them from commit.h and add new include statements in all files that require these declarations. Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'notes-merge.c')
-rw-r--r--notes-merge.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/notes-merge.c b/notes-merge.c
index 76ab19e..12dfdf6 100644
--- a/notes-merge.c
+++ b/notes-merge.c
@@ -12,6 +12,7 @@
#include "notes-merge.h"
#include "strbuf.h"
#include "notes-utils.h"
+#include "commit-reach.h"
struct notes_merge_pair {
struct object_id obj, base, local, remote;