Merge branch 'jk/clean-d-pathspec' into maint
commit9526473f110338d23524ea663eb282a36c7fe4f3
authorJunio C Hamano <gitster@pobox.com>
Tue, 18 Mar 2014 21:04:59 +0000 (18 14:04 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 18 Mar 2014 21:04:59 +0000 (18 14:04 -0700)
tree3c453cb4d879678b9998082dc2eb0ca560863b5e
parent01e13d0221e73febdcb98e26b4ae2882887421d8
parent1f2e1088871e777355025a84f80a2d8b5cb04c06
Merge branch 'jk/clean-d-pathspec' into maint

"git clean -d pathspec" did not use the given pathspec correctly
and ended up cleaning too much.

* jk/clean-d-pathspec:
  clean: simplify dir/not-dir logic
  clean: respect pathspecs with "-d"
builtin/clean.c