Code

Merge branch 'maint-1.6.6' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 16 Feb 2010 23:05:02 +0000 (15:05 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 16 Feb 2010 23:05:02 +0000 (15:05 -0800)
* maint-1.6.6:
  dwim_ref: fix dangling symref warning
  stash pop: remove 'apply' options during 'drop' invocation
  diff: make sure --output=/bad/path is caught
  Remove hyphen from "git-command" in two error messages

1  2 
diff.c
git.c
sha1_name.c

diff --cc diff.c
Simple merge
diff --cc git.c
Simple merge
diff --cc sha1_name.c
Simple merge