summaryrefslogtreecommitdiff
path: root/git-whatchanged.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-02-12 00:43:30 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-02-12 07:18:33 (GMT)
commit6932c78cb4485380a8ff63575a47a58a4e308bfd (patch)
tree2732bc20792ab8cfa7e2eacc241ef2783304f026 /git-whatchanged.sh
parent16139f9035137ccd81e1e9a9dc203fbede6997a0 (diff)
downloadgit-6932c78cb4485380a8ff63575a47a58a4e308bfd.zip
git-6932c78cb4485380a8ff63575a47a58a4e308bfd.tar.gz
git-6932c78cb4485380a8ff63575a47a58a4e308bfd.tar.bz2
diff-tree: do not default to -c
Marco says it breaks qgit. This makes the flags a bit more orthogonal. $ git-diff-tree -r --abbrev ca18 No output from this command because you asked to skip merge by not having -m there. $ git-diff-tree -r -m --abbrev ca18 ca182053c7710a286d72102f4576cf32e0dafcfb :100644 100644 538d21d... 59042d1... M Makefile :100644 100644 410b758... 6c47c3a... M entry.c ca182053c7710a286d72102f4576cf32e0dafcfb :100644 100644 30479b4... 59042d1... M Makefile The same "independent sets of diff" as before without -c. $ git-diff-tree -r -m -c --abbrev ca18 ca182053c7710a286d72102f4576cf32e0dafcfb ::100644 100644 100644 538d21d... 30479b4... 59042d1... MM Makefile Combined. $ git-diff-tree -r -c --abbrev ca18 ca182053c7710a286d72102f4576cf32e0dafcfb ::100644 100644 100644 538d21d... 30479b4... 59042d1... MM Makefile Asking for combined without -m does not make sense, so -c implies -m. We need to supply -c as default to whatchanged, which is a one-liner. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-whatchanged.sh')
-rwxr-xr-xgit-whatchanged.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-whatchanged.sh b/git-whatchanged.sh
index 574fc35..1fb9feb 100755
--- a/git-whatchanged.sh
+++ b/git-whatchanged.sh
@@ -10,7 +10,7 @@ case "$0" in
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" &&