1. Stefan Saasen
  2. git

Commits

Junio C Hamano  committed c611db1 Merge

Merge branch 'jc/fixdiff'

* jc/fixdiff:
diff-tree: do not default to -c

  • Participants
  • Parent commits 4890f62, 6932c78
  • Branches master

Comments (0)

Files changed (2)

File diff-tree.c

View file
  • Ignore whitespace
 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;
 			continue;
 		}
 		if (!strcmp(arg, "-m")) {
-			combine_merges = ignore_merges = 0;
+			ignore_merges = 0;
 			continue;
 		}
 		if (!strcmp(arg, "-c")) {

File git-whatchanged.sh

View file
  • Ignore whitespace
 	count=
 	test -z "$diff_tree_flags" &&
 		diff_tree_flags=$(git-repo-config --get whatchanged.difftree)
-	diff_tree_default_flags='-M --abbrev' ;;
+	diff_tree_default_flags='-c -M --abbrev' ;;
 *show)
 	count=-n1
 	test -z "$diff_tree_flags" &&