diff options
| -rw-r--r-- | Documentation/git-grep.txt | 7 | ||||
| -rw-r--r-- | connect.c | 1 | ||||
| -rw-r--r-- | merge-index.c | 1 | ||||
| -rw-r--r-- | pkt-line.h | 2 |
4 files changed, 10 insertions, 1 deletions
diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt index 7b810dfda7..62a8e7f222 100644 --- a/Documentation/git-grep.txt +++ b/Documentation/git-grep.txt @@ -16,7 +16,7 @@ SYNOPSIS [-n] [-l | --files-with-matches] [-L | --files-without-match] [-c | --count] [-A <post-context>] [-B <pre-context>] [-C <context>] - [-f <file>] [-e <pattern>] + [-f <file>] [-e] <pattern> [<tree>...] [--] [<path>...] @@ -71,6 +71,11 @@ OPTIONS -f <file>:: Read patterns from <file>, one per line. +-e:: + The next parameter is the pattern. This option has to be + used for patterns starting with - and should be used in + scripts passing user input to grep. + `<tree>...`:: Search blobs in the trees for specified patterns. @@ -8,6 +8,7 @@ #include <netinet/in.h> #include <arpa/inet.h> #include <netdb.h> +#include <signal.h> static char *server_capabilities = NULL; diff --git a/merge-index.c b/merge-index.c index 190e12fb7c..0498a6f45e 100644 --- a/merge-index.c +++ b/merge-index.c @@ -1,5 +1,6 @@ #include <sys/types.h> #include <sys/wait.h> +#include <signal.h> #include "cache.h" diff --git a/pkt-line.h b/pkt-line.h index 9abef24de3..9df653f6f5 100644 --- a/pkt-line.h +++ b/pkt-line.h @@ -1,6 +1,8 @@ #ifndef PKTLINE_H #define PKTLINE_H +#include "git-compat-util.h" + /* * Silly packetized line writing interface */ |