summaryrefslogtreecommitdiff
path: root/builtin-log.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-06-29 07:18:52 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-06-29 07:19:36 (GMT)
commit27e1b127f32640bea68b84e0ff57d640fd31cc92 (patch)
treed28262f9eb3f399644694e20e2a634c88814adae /builtin-log.c
parentf252281102514d8d3cc15a3df5ae633619c93835 (diff)
downloadgit-27e1b127f32640bea68b84e0ff57d640fd31cc92.zip
git-27e1b127f32640bea68b84e0ff57d640fd31cc92.tar.gz
git-27e1b127f32640bea68b84e0ff57d640fd31cc92.tar.bz2
format-patch: fix diff format option implementation
The updates forgot to make the diff go recursive.
Diffstat (limited to 'builtin-log.c')
-rw-r--r--builtin-log.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin-log.c b/builtin-log.c
index debddb9..bcd4e5e 100644
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -179,7 +179,8 @@ int cmd_format_patch(int argc, const char **argv, char **envp)
rev.diff = 1;
rev.combine_merges = 0;
rev.ignore_merges = 1;
- rev.diffopt.msg_sep = "---\n";
+ rev.diffopt.msg_sep = "";
+ rev.diffopt.recursive = 1;
git_config(git_format_config);
rev.extra_headers = extra_headers;