summaryrefslogtreecommitdiff
path: root/diff-tree.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-04-27 23:25:59 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-27 23:25:59 (GMT)
commit3a663fd9842aaa9e232ab43a811d11f1d7f0b7bc (patch)
tree89fdfd09b281fdf5071bc13a30ef683bd6851b61 /diff-tree.c
parentce9be4e4e8f397413ff5d87cda458c7e466897b1 (diff)
downloadgit-3a663fd9842aaa9e232ab43a811d11f1d7f0b7bc.zip
git-3a663fd9842aaa9e232ab43a811d11f1d7f0b7bc.tar.gz
git-3a663fd9842aaa9e232ab43a811d11f1d7f0b7bc.tar.bz2
[PATCH] diff-tree -p implies diff-tree -p -r
This makes diff-tree -p imply recursive behaviour. Other commands in the family always takes a flat universe view so this is not even needed. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'diff-tree.c')
-rw-r--r--diff-tree.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/diff-tree.c b/diff-tree.c
index cbea28d..5a1ad34 100644
--- a/diff-tree.c
+++ b/diff-tree.c
@@ -269,7 +269,7 @@ int main(int argc, char **argv)
continue;
}
if (!strcmp(arg, "-p")) {
- generate_patch = 1;
+ recursive = generate_patch = 1;
continue;
}
if (!strcmp(arg, "-z")) {