Merge branch 'jc/custom-comment-char'

diff --git a/cache.h b/cache.h
index 7339f21849b45a7f53945317893313498aff5a41..94ffcda8f6cbb603b79eda1ae441a21450a16cb5 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -563,6 +563,12 @@ extern int core_preload_index;
 extern int core_apply_sparse_checkout;
 extern int precomposed_unicode;
 
+/*
+ * The character that begins a commented line in user-editable file
+ * that is subject to stripspace.
+ */
+extern char comment_line_char;
+
 enum branch_track {
        BRANCH_TRACK_UNSPECIFIED = -1,
        BRANCH_TRACK_NEVER = 0,