Merge branch 'rs/strbuf-cocci-workaround'

diff --git a/builtin/notes.c b/builtin/notes.c
index 1a2c7d92ad7e73246be8dc64946feb00c16f7261..7c8176164561be1d57771ad2fdeb9260cc1d8c87 100644 (file)
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -12,7 +12,7 @@
 #include "builtin.h"
 #include "notes.h"
 #include "blob.h"
-#include "commit.h"
+#include "pretty.h"
 #include "refs.h"
 #include "exec_cmd.h"
 #include "run-command.h"