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)
commite7b3cea0f7589c57f7bb808330e32bdd7f901c95
treef5612fd7df20b7d7273ddf44b30117e6eb1764a9
parentb599672316ae0e0cf827e5e2cd6d3bb403d7b8cd
parenteb0bcd0fbe34befe7648a398efc7f4156b07da48
Merge branch 'maint-1.6.6' into maint

* 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
diff.c
git.c
sha1_name.c