Merge branch 'jc/cherry'

* jc/cherry:
Documentation: --cherry-pick
git-log --cherry-pick A...B
Refactor patch-id filtering out of git-cherry and git-format-patch.
Add %m to '--pretty=format:'

diff --git a/Makefile b/Makefile
index f956c3d9ba0c4bc24eacb5193cc123e20325976c..b8e603094050377fb8ca2988c2558c76fe113e70 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -729,7 +729,7 @@ git$X: git.c common-cmds.h $(BUILTIN_OBJS) $(GITLIBS) GIT-CFLAGS
 help.o: common-cmds.h
 
 git-merge-subtree$X: git-merge-recursive$X
-       rm -f $@ && ln git-merge-recursive$X $@
+       $(QUIET_BUILT_IN)rm -f $@ && ln git-merge-recursive$X $@
 
 $(BUILT_INS): git$X
        $(QUIET_BUILT_IN)rm -f $@ && ln git$X $@

diff --git a/builtin-log.c b/builtin-log.c
index eea96901b9dc339aa2b60ba35c8ce6a5ee369125..469949457f61eee95f6ba801c4f81328a06cffda 100644 (file)
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -419,7 +419,6 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
        rev.ignore_merges = 1;
        rev.diffopt.msg_sep = "";
        rev.diffopt.recursive = 1;
-       rev.subject_prefix = "PATCH";
 
        rev.extra_headers = extra_headers;
 

diff --git a/git.c b/git.c
index 33dd4d39d907a229679a41f9712ee99007a34f3b..7def319e609454cd2389d2fc60caeaa5831d339e 100644 (file)
--- a/git.c
+++ b/git.c
@@ -66,6 +66,7 @@ static int handle_options(const char*** argv, int* argc)
                        setenv(GIT_DIR_ENVIRONMENT, (*argv)[1], 1);
                        (*argv)++;
                        (*argc)--;
+                       handled++;
                } else if (!prefixcmp(cmd, "--git-dir=")) {
                        setenv(GIT_DIR_ENVIRONMENT, cmd + 10, 1);
                } else if (!strcmp(cmd, "--bare")) {

diff --git a/revision.c b/revision.c
index e9de8650d37398b5d46256eced053f3b7dd4e25a..ce70f48ce0880e8b43c3f62cd13bc185bfee8c4b 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -651,6 +651,7 @@ void init_revisions(struct rev_info *revs, const char *prefix)
        revs->min_age = -1;
        revs->skip_count = -1;
        revs->max_count = -1;
+       revs->subject_prefix = "PATCH";
 
        revs->prune_fn = NULL;
        revs->prune_data = NULL;