From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 5 Oct 2011 19:36:17 +0000 (-0700)
Subject: Merge branch 'bc/unstash-clean-crufts'
X-Git-Tag: v1.7.8-rc0~144
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9eb765d5f400aa922a46f1727259ce114b78561c;p=git.git

Merge branch 'bc/unstash-clean-crufts'

* bc/unstash-clean-crufts:
  git-stash: remove untracked/ignored directories when stashed
  t/t3905: add missing '&&' linkage
  git-stash.sh: fix typo in error message
  t/t3905: use the name 'actual' for test output, swap arguments to test_cmp
---

9eb765d5f400aa922a46f1727259ce114b78561c