undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/fixdiff'

Browse Source 
* jc/fixdiff:
  diff-tree: do not default to -c
This commit is contained in:
Junio C Hamano 2006-02-12 05:02:25 -08:00
commit c611db196a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
diff-tree.c
View File

@ -6,7 +6,7 @@ static int show_root_diff = 0;
static int no_commit_id = 0; static int no_commit_id = 0;
static int verbose_header = 0; static int verbose_header = 0;
static int ignore_merges = 1; static int ignore_merges = 1;
static int combine_merges = 1; static int combine_merges = 0;
static int dense_combined_merges = 0; static int dense_combined_merges = 0;
static int read_stdin = 0; static int read_stdin = 0;
static int always_show_header = 0; static int always_show_header = 0;
@ -248,7 +248,7 @@ int main(int argc, const char **argv)
continue; continue;
} }
if (!strcmp(arg, "-m")) { if (!strcmp(arg, "-m")) {
combine_merges = ignore_merges = 0; ignore_merges = 0;
continue; continue;
} }
if (!strcmp(arg, "-c")) { if (!strcmp(arg, "-c")) {

2
git-whatchanged.sh
View File

@ -10,7 +10,7 @@ case "$0" in
count= count=
test -z "$diff_tree_flags" && test -z "$diff_tree_flags" &&
diff_tree_flags=$(git-repo-config --get whatchanged.difftree) diff_tree_flags=$(git-repo-config --get whatchanged.difftree)
diff_tree_default_flags='-M --abbrev' ;; diff_tree_default_flags='-c -M --abbrev' ;;
*show) *show)
count=-n1 count=-n1
test -z "$diff_tree_flags" && test -z "$diff_tree_flags" &&