diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-02-12 13:02:25 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-02-12 13:02:25 (GMT) |
| commit | c611db196a8830135e1a03e5b4fa6502714ded24 (patch) | |
| tree | 696f6a3ab5fc4afae7f301ff10526a5e4b8c1278 /diff-tree.c | |
| parent | 4890f62bc02929b174ff5fa0e3656ea3d40f0e57 (diff) | |
| parent | 6932c78cb4485380a8ff63575a47a58a4e308bfd (diff) | |
| download | git-c611db196a8830135e1a03e5b4fa6502714ded24.zip git-c611db196a8830135e1a03e5b4fa6502714ded24.tar.gz git-c611db196a8830135e1a03e5b4fa6502714ded24.tar.bz2 | |
Merge branch 'jc/fixdiff'
* jc/fixdiff:
diff-tree: do not default to -c
Diffstat (limited to 'diff-tree.c')
| -rw-r--r-- | diff-tree.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/diff-tree.c b/diff-tree.c index b170b03..f55a35a 100644 --- a/diff-tree.c +++ b/diff-tree.c @@ -6,7 +6,7 @@ static int show_root_diff = 0; static int no_commit_id = 0; static int verbose_header = 0; static int ignore_merges = 1; -static int combine_merges = 1; +static int combine_merges = 0; static int dense_combined_merges = 0; static int read_stdin = 0; static int always_show_header = 0; @@ -248,7 +248,7 @@ int main(int argc, const char **argv) continue; } if (!strcmp(arg, "-m")) { - combine_merges = ignore_merges = 0; + ignore_merges = 0; continue; } if (!strcmp(arg, "-c")) { |