summaryrefslogtreecommitdiff
path: root/include/git2/submodule.h
diff options
context:
space:
mode:
authorRussell Belfer <rb@github.com>2012-03-30 14:40:50 -0700
committerRussell Belfer <rb@github.com>2012-03-30 14:40:50 -0700
commit95dfb031f70601b12a9eb57229fd4aa9a51ddd54 (patch)
tree1413fc2f40bdc3e1af6c5ff16f5550de142e6bf3 /include/git2/submodule.h
parentbfc9ca595aa2f189743f2a7b9812f05def78ec88 (diff)
downloadlibgit2-95dfb031f70601b12a9eb57229fd4aa9a51ddd54.tar.gz
Improve config handling for diff,submodules,attrs
This adds support for a bunch of core.* settings that affect diff and status, plus fixes up some incorrect implementations of those settings from before. Also, this cleans up the handling of config settings in the new submodules code and in the old attrs/ignore code.
Diffstat (limited to 'include/git2/submodule.h')
-rw-r--r--include/git2/submodule.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/include/git2/submodule.h b/include/git2/submodule.h
index aee2260c..93016827 100644
--- a/include/git2/submodule.h
+++ b/include/git2/submodule.h
@@ -22,7 +22,7 @@ GIT_BEGIN_DECL
typedef enum {
GIT_SUBMODULE_UPDATE_CHECKOUT = 0,
- GIT_SUBMOUDLE_UPDATE_REBASE = 1,
+ GIT_SUBMODULE_UPDATE_REBASE = 1,
GIT_SUBMODULE_UPDATE_MERGE = 2
} git_submodule_update_t;
@@ -80,8 +80,6 @@ GIT_EXTERN(int) git_submodule_foreach(
int (*callback)(const char *name, void *payload),
void *payload);
-#define GIT_SUBMODULE_HEAD "[internal]HEAD"
-
/**
* Lookup submodule information by name or path.
*