summaryrefslogtreecommitdiff
path: root/commit.h
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2008-10-03 07:41:25 -0700
committerShawn O. Pearce <spearce@spearce.org>2008-10-03 07:41:25 -0700
commit3e3d4ee7cb7726dcf799f95d27bce384c32b2c8a (patch)
treefe6a29d3d62f85eea9953deaf5653741fe73e54c /commit.h
parentd627f68fbbe0480337cd56cce442ed8c1efa230e (diff)
parent0d1d154dbe4d16a802c2e357de96e349f04d2f2c (diff)
downloadgit-3e3d4ee7cb7726dcf799f95d27bce384c32b2c8a.tar.gz
Merge branch 'pb/gitweb-tagcloud' into pb/gitweb
* pb/gitweb-tagcloud: gitweb: Support for simple project search form gitweb: Make the by_tag filter delve in forks as well gitweb: Support for tag clouds ... (+ many updates from master) ... Conflicts: gitweb/gitweb.perl
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 de15f4d715..4c05864fb4 100644
--- a/commit.h
+++ b/commit.h
@@ -118,7 +118,6 @@ struct commit_graft {
struct commit_graft *read_graft_line(char *buf, int len);
int register_commit_graft(struct commit_graft *, int);
-int read_graft_file(const char *graft_file);
struct commit_graft *lookup_commit_graft(const unsigned char *sha1);
extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2, int cleanup);