Merge branch 'doc-style/for-next' of git://repo.or.cz/git/trast

diff --git a/notes.h b/notes.h
index 79d21b65f56d2374aed14e58810d1b7c58fafb8a..a1421e351ae0a6f97824b150140e49ddd5d3414d 100644 (file)
--- a/notes.h
+++ b/notes.h
@@ -1,7 +1,13 @@
 #ifndef NOTES_H
 #define NOTES_H
 
+/* Free (and de-initialize) the internal notes tree structure */
+void free_notes(void);
+
+#define NOTES_SHOW_HEADER 1
+#define NOTES_INDENT 2
+
 void get_commit_notes(const struct commit *commit, struct strbuf *sb,
-               const char *output_encoding);
+               const char *output_encoding, int flags);
 
 #endif