Merge branch 'ew/rebase'

* ew/rebase:
rebase: allow --skip to work with --merge
rebase: cleanup rebasing with --merge
rebase: allow --merge option to handle patches merged upstream

diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt
index 7b810dfda760a01c78667015f7c6214fcaeceae6..62a8e7f222d480046beee5cf735fa92821e26f8d 100644 (file)
--- 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.
 

diff --git a/connect.c b/connect.c
index db7342e4d26baa50dd944ebf06fb8b66fea59aaa..66e78a29054a121c92beca3d997105f0137c170d 100644 (file)
--- a/connect.c
+++ b/connect.c
@@ -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 190e12fb7ceeb012a063f8c97b574e9650d95cc1..0498a6f45e53947e356c6a390869d3f8194f05b7 100644 (file)
--- 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 9abef24de36119a56a9bee48e49c2c8fccae32fc..9df653f6f5afe720870658d7093bddbf3e66beaf 100644 (file)
--- 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
  */