Merge branch 'jc/merge-x-theirs-docfix' into maint

diff --git a/commit.h b/commit.h
index 4127c298cb1370a9ab56ca9d003e853b3e26b67e..f3805fec6b3a5853316d1476619adc5410224a7e 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -313,11 +313,6 @@ extern int interactive_add(int argc, const char **argv, const char *prefix, int
 extern int run_add_interactive(const char *revision, const char *patch_mode,
                               const struct pathspec *pathspec);
 
-static inline int single_parent(struct commit *commit)
-{
-       return commit->parents && !commit->parents->next;
-}
-
 struct commit_list *reduce_heads(struct commit_list *heads);
 
 struct commit_extra_header {