Merge branch 'ss/pull-rebase-preserve'

diff --git a/commit.h b/commit.h
index 5cc1e7ec9ee80965d1669e0f96dfeab03f3b0798..9f189cb054266cd8f8c084853afbb678ca56c9e9 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -254,7 +254,6 @@ extern int for_each_commit_graft(each_commit_graft_fn, void *);
 extern int is_repository_shallow(void);
 extern struct commit_list *get_shallow_commits(struct object_array *heads,
                int depth, int shallow_flag, int not_shallow_flag);
-extern void check_shallow_file_for_update(void);
 extern void set_alternate_shallow_file(const char *path, int override);
 extern int write_shallow_commits(struct strbuf *out, int use_pack_protocol,
                                 const struct sha1_array *extra);