aboutsummaryrefslogtreecommitdiff
path: root/builtin-diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-05-06 21:47:22 -0700
committerJunio C Hamano <junkio@cox.net>2006-05-06 21:47:22 -0700
commitc2b9e6994d044b218e59abf6d19f7751c4aa13e3 (patch)
tree191050855782f098c4ef4a24bcb673cda33f1902 /builtin-diff.c
parente04156a437e671a772187da789d6a736a8125eef (diff)
parente686eb9870d6b382f0760e3e859e93c8c2dfb31b (diff)
downloadgit-c2b9e6994d044b218e59abf6d19f7751c4aa13e3.tar.xz
Merge branch 'js/fmt-patch' into next
* js/fmt-patch: fmt-patch: understand old <his> notation t1300-repo-config: two new config parsing tests. Another config file parsing fix.
Diffstat (limited to 'builtin-diff.c')
-rw-r--r--builtin-diff.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-diff.c b/builtin-diff.c
index 636edbf2a7..20873162f9 100644
--- a/builtin-diff.c
+++ b/builtin-diff.c
@@ -232,7 +232,7 @@ static int builtin_diff_combined(struct rev_info *revs,
return 0;
}
-static void add_head(struct rev_info *revs)
+void add_head(struct rev_info *revs)
{
unsigned char sha1[20];
struct object *obj;