git-am: Add am.keepcr and --no-keep-cr to override it

diff --git a/revision.h b/revision.h
index d368003159738570220c0e4713efd91f83303339..a14deefc252bd641fba5e16f7859b4a985a72578 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -80,6 +80,9 @@ struct rev_info {
        /* Format info */
        unsigned int    shown_one:1,
                        show_merge:1,
+                       show_notes:1,
+                       show_notes_given:1,
+                       pretty_given:1,
                        abbrev_commit:1,
                        use_terminator:1,
                        missing_newline:1,