Merge branch 'rh/ishes-doc'

diff --git a/commit.h b/commit.h
index ca766d2f4aa0df98d958e19449ab24d417c5539b..90a5a3c361e02cd7a9562eff2ca1b15f77be0941 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -105,8 +105,6 @@ struct pretty_print_context {
         * Fields below here are manipulated internally by pp_* functions and
         * should not be counted on by callers.
         */
-
-       /* Manipulated by the pp_* functions internally. */
        struct string_list in_body_headers;
 };
 
@@ -210,7 +208,7 @@ int in_merge_bases_many(struct commit *, int, struct commit **);
 
 extern int interactive_add(int argc, const char **argv, const char *prefix, int patch);
 extern int run_add_interactive(const char *revision, const char *patch_mode,
-                              const char **pathspec);
+                              const struct pathspec *pathspec);
 
 static inline int single_parent(struct commit *commit)
 {