diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-06-29 00:18:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-29 00:19:36 -0700 |
| commit | 27e1b127f32640bea68b84e0ff57d640fd31cc92 (patch) | |
| tree | d28262f9eb3f399644694e20e2a634c88814adae | |
| parent | Merge branch 'jc/diff-test-updates' into th/diff (diff) | |
| download | tgif-27e1b127f32640bea68b84e0ff57d640fd31cc92.tar.xz | |
format-patch: fix diff format option implementation
The updates forgot to make the diff go recursive.
| -rw-r--r-- | builtin-log.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin-log.c b/builtin-log.c index debddb97a0..bcd4e5e161 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; |