]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7af4d34 7474b8b)
Merge branch 'bc/unstash-clean-crufts'
authorJunio C Hamano <gitster@pobox.com>
Wed, 5 Oct 2011 19:36:17 +0000 (12:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 5 Oct 2011 19:36:17 +0000 (12:36 -0700)
* 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

1  2 
git-stash.sh patch | diff1 | diff2 | blob | history

diff --cc git-stash.sh
Simple merge
Unnamed repository; edit this file 'description' to name the repository.