diff options
Diffstat (limited to 'repository.h')
| -rw-r--r-- | repository.h | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/repository.h b/repository.h index 9bbb4659cc..6cc661e5a4 100644 --- a/repository.h +++ b/repository.h @@ -47,6 +47,18 @@ struct repo_settings { int core_multi_pack_index; }; +struct repo_path_cache { + char *squash_msg; + char *merge_msg; + char *merge_rr; + char *merge_mode; + char *merge_head; + char *merge_autostash; + char *auto_merge; + char *fetch_head; + char *shallow; +}; + struct repository { /* Environment */ /* @@ -85,7 +97,7 @@ struct repository { /* * Contains path to often used file names. */ - struct path_cache cached_paths; + struct repo_path_cache cached_paths; /* * Path to the repository's graft file. |