summaryrefslogtreecommitdiff
path: root/wt-status.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-05-25 21:25:02 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-05-25 21:25:02 (GMT)
commit9bd81e4249a419f9cde8fd68e033e263533f4914 (patch)
tree5a4c77cc648dc720e40c76e83a489ab40e70e187 /wt-status.h
parent450c5aed06ecf60084f993f688b549ffa377b64e (diff)
parentef90d6d4208a5130185b04f06e5f90a5f9959fe3 (diff)
downloadgit-9bd81e4249a419f9cde8fd68e033e263533f4914.zip
git-9bd81e4249a419f9cde8fd68e033e263533f4914.tar.gz
git-9bd81e4249a419f9cde8fd68e033e263533f4914.tar.bz2
Merge branch 'js/config-cb'v1.5.6-rc0
* js/config-cb: Provide git_config with a callback-data parameter Conflicts: builtin-add.c builtin-cat-file.c
Diffstat (limited to 'wt-status.h')
-rw-r--r--wt-status.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/wt-status.h b/wt-status.h
index f0675fd..597c7ea 100644
--- a/wt-status.h
+++ b/wt-status.h
@@ -28,7 +28,7 @@ struct wt_status {
const char *prefix;
};
-int git_status_config(const char *var, const char *value);
+int git_status_config(const char *var, const char *value, void *cb);
extern int wt_status_use_color;
extern int wt_status_relative_paths;
void wt_status_prepare(struct wt_status *s);