Merge branch 'jk/help-alias'

* jk/help-alias:
  help: respect aliases
  make alias lookup a public, procedural function
  help: use parseopt

1 files changed, 2 insertions, 0 deletions

diff --git a/cache.h b/cache.h
index 922bed9212..7769f055e9 100644
--- a/cache.h
+++ b/cache.h
@@ -768,4 +768,6 @@ int pathspec_match(const char **spec, char *matched, const char *filename, int s
 int report_path_error(const char *ps_matched, const char **pathspec, int prefix_offset);
 void overlay_tree_on_cache(const char *tree_name, const char *prefix);
 
+char *alias_lookup(const char *alias);
+
 #endif /* CACHE_H */