Code

Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Wed, 17 Feb 2010 06:40:45 +0000 (22:40 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 17 Feb 2010 06:40:45 +0000 (22:40 -0800)
* maint:
  Prepare 1.7.0.1 release notes
  Fix use of mutex in threaded grep
  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 
builtin-grep.c
git.c

diff --cc builtin-grep.c
Simple merge
diff --cc git.c
Simple merge