Merge branch 'ld/git-p4-updates'

diff --git a/shell.c b/shell.c
index 0200d10796c43d6ea1249c314ee158f2b57a481f..40084a30130ef844899bc1f3321285afdda82607 100644 (file)
--- a/shell.c
+++ b/shell.c
@@ -3,6 +3,7 @@
 #include "exec-cmd.h"
 #include "strbuf.h"
 #include "run-command.h"
+#include "alias.h"
 
 #define COMMAND_DIR "git-shell-commands"
 #define HELP_COMMAND COMMAND_DIR "/help"