diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-10-10 15:56:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-10 15:56:17 -0700 |
| commit | efc5fb6a77780c53c6636326ca82ff87b17e4c5f (patch) | |
| tree | df55c7da6100b8b102b183dee72c9137b0d68075 /cache.h | |
| parent | 27c0f768843b6d844674f1fb8dc2676d830b56e3 (diff) | |
| parent | 501770e1bb5d132ae4f79aa96715f07f6b84e1f6 (diff) | |
| download | git-efc5fb6a77780c53c6636326ca82ff87b17e4c5f.tar.gz git-efc5fb6a77780c53c6636326ca82ff87b17e4c5f.tar.xz | |
Merge branch 'fg/submodule-git-file-git-dir'
* fg/submodule-git-file-git-dir:
Move git-dir for submodules
rev-parse: add option --resolve-git-dir <path>
Conflicts:
cache.h
git-submodule.sh
Diffstat (limited to 'cache.h')
| -rw-r--r-- | cache.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -439,6 +439,7 @@ extern const char *get_git_namespace(void); extern const char *strip_namespace(const char *namespaced_ref); extern const char *get_git_work_tree(void); extern const char *read_gitfile(const char *path); +extern const char *resolve_gitdir(const char *suspect); extern void set_git_work_tree(const char *tree); #define ALTERNATE_DB_ENVIRONMENT "GIT_ALTERNATE_OBJECT_DIRECTORIES" |