Merge branch 'js/config-cb'
* js/config-cb: Provide git_config with a callback-data parameter Conflicts: builtin-add.c builtin-cat-file.c
This commit is contained in:
@ -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);
|
||||
|
Reference in New Issue
Block a user