Merge branch 'es/grep-require-name-when-needed' into maint

diff --git a/alias.h b/alias.h
index 79933f2457ce265e2d141459308c8407488cca69..aef4843bb7821e87dcbe017ddfff64b8d6681fca 100644 (file)
--- a/alias.h
+++ b/alias.h
@@ -1,5 +1,5 @@
-#ifndef __ALIAS_H__
-#define __ALIAS_H__
+#ifndef ALIAS_H
+#define ALIAS_H
 
 struct string_list;