Junio C Hamano 1a2321f608 Merge branch 'master' into next ...

* master:
  sideband: do not use color, just say "remote:"
  Show both blob names from "git diff blob1 blob2"
  diff.c: do not use pathname comparison to tell renames
  Add a couple of subdirectory tests.
  read-tree: shadowed variable fix.
  fixed variable declaration in gitk
  Fix "git diff blob1 blob2" showing the diff in reverse.

2006-08-03 16:06:41 -07:00

62 KiB

Raw Blame History

View Raw