summaryrefslogtreecommitdiff
path: root/commit.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-07-14 23:47:48 -0700
committerJunio C Hamano <gitster@pobox.com>2008-07-14 23:47:48 -0700
commit1864265c4d9afa374b27836ff0a3b3eb40144552 (patch)
treeae7b7c73ad1ee6a7081165db96b0484fab1a421a /commit.h
parentabce32b5ba5cf91c85b032d2dbb2702679a5608e (diff)
parent5b2fd95606cd6d564f96d9d253e7cd19263bc352 (diff)
downloadgit-1864265c4d9afa374b27836ff0a3b3eb40144552.tar.gz
Merge branch 'sb/rerere-lib'
* sb/rerere-lib: rerere: Separate libgit and builtin functions
Diffstat (limited to 'commit.h')
-rw-r--r--commit.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/commit.h b/commit.h
index 2d94d4148e..fda7ad03c0 100644
--- a/commit.h
+++ b/commit.h
@@ -131,7 +131,6 @@ extern struct commit_list *get_shallow_commits(struct object_array *heads,
int in_merge_bases(struct commit *, struct commit **, int);
extern int interactive_add(int argc, const char **argv, const char *prefix);
-extern int rerere(void);
static inline int single_parent(struct commit *commit)
{