Merge branch 'ss/commit-squash-msg' into maint

diff --git a/trailer.h b/trailer.h
index 8eb25d565e284f54d32b1840ceeb45872dc6efb9..36b40b81761f95742c9c6fe7e94ba89f19aabfde 100644 (file)
--- a/trailer.h
+++ b/trailer.h
@@ -1,6 +1,7 @@
 #ifndef TRAILER_H
 #define TRAILER_H
 
-void process_trailers(const char *file, int trim_empty, struct string_list *trailers);
+void process_trailers(const char *file, int in_place, int trim_empty,
+                     struct string_list *trailers);
 
 #endif /* TRAILER_H */